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

chrome/installer/setup/setup_util.cc

Index: chrome/installer/setup/setup_util.cc
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index b86760525be4e48560499dfc4a18b45a323ffa41..572c54a3c73e0abeadfe316c903ceacaa248a311 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -41,7 +41,6 @@
 #include "chrome/installer/util/util_constants.h"
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff/bsdiff.h"
-#include "third_party/bspatch/mbspatch.h"
 
 namespace installer {
 
@@ -149,8 +148,8 @@ int BsdiffPatchFiles(const base::FilePath& src,
   if (src.empty() || patch.empty() || dest.empty())
     return installer::PATCH_INVALID_ARGUMENTS;
 
-  const int patch_status = courgette::ApplyBinaryPatch(src, patch, dest);
-  const int exit_code = patch_status != OK ?
+  const int patch_status = bsdiff::ApplyBinaryPatch(src, patch, dest);
+  const int exit_code = patch_status != bsdiff::OK ?
                         patch_status + kBsdiffErrorOffset : 0;
 
   LOG_IF(ERROR, exit_code)