Add support for bsdiff of file system metadata blocks
BUG=chromium-os:10188
TEST=Unit test, build delta update, apply to Mario and make sure it
boots with new version
Change-Id: I37b3fcc3c0e65e063cd95b0b3c9a5cd2261c98c9
Review URL: http://codereview.chromium.org/5684002
diff --git a/delta_diff_generator_unittest.cc b/delta_diff_generator_unittest.cc
index 2a70399..bd0b48e 100644
--- a/delta_diff_generator_unittest.cc
+++ b/delta_diff_generator_unittest.cc
@@ -6,13 +6,17 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+
#include <set>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
+
+#include <base/logging.h>
+#include <base/string_util.h>
#include <gtest/gtest.h>
-#include "base/logging.h"
+
#include "update_engine/cycle_breaker.h"
#include "update_engine/delta_diff_generator.h"
#include "update_engine/delta_performer.h"
@@ -713,7 +717,7 @@
&fd));
ScopedFdCloser fd_closer(&fd);
off_t data_file_size = 0;
-
+
EXPECT_TRUE(DeltaDiffGenerator::AssignTempBlocks(&graph,
temp_dir,
fd,