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

components/update_client/component_patcher_operation.cc

 // Copyright 2014 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 "components/update_client/component_patcher_operation.h"
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 190 matching lines @@
   if (out_of_process_patcher_.get()) {
     out_of_process_patcher_->Patch(
         operation_, GetTaskRunner(), input_abs_path_, patch_abs_path_,
         output_abs_path_,
         base::Bind(&DeltaUpdateOpPatch::DonePatching, this, callback));
     return;
   }
 
   if (operation_ == kBsdiff) {
     DonePatching(callback,
-                 courgette::ApplyBinaryPatch(input_abs_path_, patch_abs_path_,
-                                             output_abs_path_));
+                 bsdiff::ApplyBinaryPatch(input_abs_path_, patch_abs_path_,
+                                          output_abs_path_));
   } else if (operation_ == kCourgette) {
     DonePatching(callback, courgette::ApplyEnsemblePatch(
                                input_abs_path_.value().c_str(),
                                patch_abs_path_.value().c_str(),
                                output_abs_path_.value().c_str()));
   } else {
     NOTREACHED();
   }
 }
 
 void DeltaUpdateOpPatch::DonePatching(
     const ComponentUnpacker::Callback& callback,
     int result) {
   if (operation_ == kBsdiff) {
-    if (result == courgette::OK) {
+    if (result == bsdiff::OK) {
       callback.Run(ComponentUnpacker::kNone, 0);
     } else {
       callback.Run(ComponentUnpacker::kDeltaOperationFailure,
                    result + kBsdiffErrorOffset);
     }
   } else if (operation_ == kCourgette) {
     if (result == courgette::C_OK) {
       callback.Run(ComponentUnpacker::kNone, 0);
     } else {
       callback.Run(ComponentUnpacker::kDeltaOperationFailure,
                    result + kCourgetteErrorOffset);
     }
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace update_client