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

courgette/third_party/bsdiff/qsufsort_unittest.cc

Index: courgette/third_party/bsdiff/qsufsort_unittest.cc
diff --git a/courgette/third_party/bsdiff/qsufsort_unittest.cc b/courgette/third_party/bsdiff/qsufsort_unittest.cc
index 4e49fe2c4413fb880f50ebad061d3f04303a6e7e..1e1156fcffd7bc2537341f31331d94a49b0190e5 100644
--- a/courgette/third_party/bsdiff/qsufsort_unittest.cc
+++ b/courgette/third_party/bsdiff/qsufsort_unittest.cc
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "courgette/third_party/bsdiff/bsdiff_search.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(QSufSortTest, Sort) {
@@ -38,7 +39,7 @@ TEST(QSufSortTest, Sort) {
     // Generate the suffix array as I.
     std::vector<int> I(len + 1);
     std::vector<int> V(len + 1);
-    courgette::qsuf::qsufsort<int*>(&I[0], &V[0], s, len);
+    qsuf::qsufsort<int*>(&I[0], &V[0], s, len);
 
     // Expect that I[] is a permutation of [0, len].
     std::vector<int> I_sorted(I);
@@ -71,7 +72,7 @@ TEST(QSufSortTest, Search) {
       reinterpret_cast<const unsigned char*>(old_str);
   std::vector<int> I(old_size + 1);
   std::vector<int> V(old_size + 1);
-  courgette::qsuf::qsufsort<int*>(&I[0], &V[0], old_buf, old_size);
+  qsuf::qsufsort<int*>(&I[0], &V[0], old_buf, old_size);
 
   // Test queries.
   const struct {
@@ -117,8 +118,8 @@ TEST(QSufSortTest, Search) {
 
     // Perform the search.
     int pos = 0;
-    int match_len = courgette::qsuf::search(&I[0], old_buf, old_size, new_buf,
-                                            new_size, &pos);
+    int match_len = bsdiff::search(&I[0], old_buf, old_size, new_buf, new_size,
+                                   &pos);
 
     // Check basic properties and match with expected values.
     EXPECT_GE(match_len, 0) << "test_case[" << idx << "]";