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

courgette/third_party/bsdiff/bsdiff_create.cc

Index: courgette/third_party/bsdiff/bsdiff_create.cc
diff --git a/courgette/third_party/bsdiff/bsdiff_create.cc b/courgette/third_party/bsdiff/bsdiff_create.cc
index 46a32b8bda8ac659ec3294f735a14716ebbd6382..35de0dd909fa3630e67d56701e4841e60ad74b63 100644
--- a/courgette/third_party/bsdiff/bsdiff_create.cc
+++ b/courgette/third_party/bsdiff/bsdiff_create.cc
@@ -22,7 +22,7 @@
                  --Stephen Adams <sra@chromium.org>
   2015-08-03 - Extract qsufsort portion to a separate file.
                  --Samuel Huang <huangs@chromium.org>
-  2015-08-12 - Interface change to qsufsort search().
+  2015-08-12 - Interface change to search().
                  --Samuel Huang <huangs@chromium.org>
 */
 
@@ -39,10 +39,22 @@
 
 #include "courgette/crc.h"
 #include "courgette/streams.h"
+#include "courgette/third_party/bsdiff/bsdiff_search.h"
 #include "courgette/third_party/bsdiff/paged_array.h"
 #include "courgette/third_party/bsdiff/qsufsort.h"
 
-namespace courgette {
+namespace {
+
+using courgette::CalculateCrc;
+using courgette::PagedArray;
+using courgette::SinkStream;
+using courgette::SinkStreamSet;
+using courgette::SourceStream;
+using courgette::SourceStreamSet;
+
+}  // namespace
+
+namespace bsdiff {
 
 static CheckBool WriteHeader(SinkStream* stream, MBSPatchHeader* header) {
   bool ok = stream->Write(header->tag, sizeof(header->tag));
@@ -151,7 +163,7 @@ BSDiffStatus CreateBinaryPatch(SourceStream* old_stream,
 
     scan += match_length;
     for (int scsc = scan; scan < newsize; ++scan) {
-      match_length = qsuf::search<PagedArray<int>&>(
+      match_length = search<PagedArray<int>&>(
           I, old, oldsize, newbuf + scan, newsize - scan, &pos);
 
       for (; scsc < scan + match_length; scsc++)
@@ -316,4 +328,4 @@ BSDiffStatus CreateBinaryPatch(SourceStream* old_stream,
   return OK;
 }
 
-}  // namespace courgette
+}  // namespace bsdiff