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

courgette/bsdiff_memory_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/third_party/bsdiff/bsdiff.h"
 
 #include <stddef.h>
 
 #include "courgette/base_test_unittest.h"
 #include "courgette/courgette.h"
 #include "courgette/streams.h"
 
 class BSDiffMemoryTest : public BaseTest {
  public:
   void GenerateAndTestPatch(const std::string& a, const std::string& b) const;
 
   std::string GenerateSyntheticInput(size_t length, int seed) const;
 };
 
 void BSDiffMemoryTest::GenerateAndTestPatch(const std::string& old_text,
                                             const std::string& new_text) const {
   courgette::SourceStream old1;
   courgette::SourceStream new1;
   old1.Init(old_text.c_str(), old_text.length());
   new1.Init(new_text.c_str(), new_text.length());
 
   courgette::SinkStream patch1;
-  courgette::BSDiffStatus status = CreateBinaryPatch(&old1, &new1, &patch1);
-  EXPECT_EQ(courgette::OK, status);
+  bsdiff::BSDiffStatus status =
+      bsdiff::CreateBinaryPatch(&old1, &new1, &patch1);
+  EXPECT_EQ(bsdiff::OK, status);
 
   courgette::SourceStream old2;
   courgette::SourceStream patch2;
   old2.Init(old_text.c_str(), old_text.length());
   patch2.Init(patch1);
 
   courgette::SinkStream new2;
-  status = ApplyBinaryPatch(&old2, &patch2, &new2);
-  EXPECT_EQ(courgette::OK, status);
+  status = bsdiff::ApplyBinaryPatch(&old2, &patch2, &new2);
+  EXPECT_EQ(bsdiff::OK, status);
   EXPECT_EQ(new_text.length(), new2.Length());
   EXPECT_EQ(0, memcmp(new_text.c_str(), new2.Buffer(), new_text.length()));
 }
 
 std::string BSDiffMemoryTest::GenerateSyntheticInput(size_t length, int seed)
   const {
   static const char* a[8] = {"O", "A", "x", "-", "y", ".", "|", ":"};
   std::string result;
   while (result.length() < length) {
     seed = (seed + 17) * 1049 + (seed >> 27);
@@ skipping 69 matching lines @@
   std::string file1 = FileContents("setup1.exe");
   std::string file2 = FileContents("setup2.exe");
   GenerateAndTestPatch(file1, file2);
 }
 
 TEST_F(BSDiffMemoryTest, TestDifferentElfs) {
   std::string file1 = FileContents("elf-32-1");
   std::string file2 = FileContents("elf-32-2");
   GenerateAndTestPatch(file1, file2);
 }