[Courgette] Refactor BSDiff namespaces and bsdiff::search() interface.

courgette/courgette_tool.cc

Index: courgette/courgette_tool.cc
diff --git a/courgette/courgette_tool.cc b/courgette/courgette_tool.cc
index 83a68343863267fdd8c47615bdc50edf5de9d587..e45f418698d923e0983b1a1b92c4b2d202a95f32 100644
--- a/courgette/courgette_tool.cc
+++ b/courgette/courgette_tool.cc
@@ -280,9 +280,9 @@ void DisassembleAdjustDiff(const base::FilePath& model_file,
     old_source.Init(old_stream ? *old_stream : empty_sink);
     new_source.Init(new_stream ? *new_stream : empty_sink);
     courgette::SinkStream patch_stream;
-    courgette::BSDiffStatus status =
-        courgette::CreateBinaryPatch(&old_source, &new_source, &patch_stream);
-    if (status != courgette::OK) Problem("-xxx failed.");
+    bsdiff::BSDiffStatus status =
+        bsdiff::CreateBinaryPatch(&old_source, &new_source, &patch_stream);
+    if (status != bsdiff::OK) Problem("-xxx failed.");
 
     std::string append = std::string("-") + base::IntToString(i);
 
@@ -404,10 +404,10 @@ void GenerateBSDiffPatch(const base::FilePath& old_file,
   new_stream.Init(new_buffer);
 
   courgette::SinkStream patch_stream;
-  courgette::BSDiffStatus status =
-      courgette::CreateBinaryPatch(&old_stream, &new_stream, &patch_stream);
+  bsdiff::BSDiffStatus status =
+      bsdiff::CreateBinaryPatch(&old_stream, &new_stream, &patch_stream);
 
-  if (status != courgette::OK) Problem("-genbsdiff failed.");
+  if (status != bsdiff::OK) Problem("-genbsdiff failed.");
 
   WriteSinkToFile(&patch_stream, patch_file);
 }
@@ -424,10 +424,10 @@ void ApplyBSDiffPatch(const base::FilePath& old_file,
   patch_stream.Init(patch_buffer);
 
   courgette::SinkStream new_stream;
-  courgette::BSDiffStatus status =
-      courgette::ApplyBinaryPatch(&old_stream, &patch_stream, &new_stream);
+  bsdiff::BSDiffStatus status =
+      bsdiff::ApplyBinaryPatch(&old_stream, &patch_stream, &new_stream);
 
-  if (status != courgette::OK) Problem("-applybsdiff failed.");
+  if (status != bsdiff::OK) Problem("-applybsdiff failed.");
 
   WriteSinkToFile(&new_stream, new_file);
 }