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

chrome/installer/setup/setup_util.cc

 // Copyright (c) 2012 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.
 //
 // This file declares util functions for setup project.
 
 #include "chrome/installer/setup/setup_util.h"
 
 #include <windows.h>
 #include <stddef.h>
@@ skipping 19 matching lines @@
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/app_registration_data.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #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 {
 
 namespace {
 
 // Returns true if product |type| cam be meaningfully installed without the
 // --multi-install flag.
 bool SupportsSingleInstall(BrowserDistribution::Type type) {
   return (type == BrowserDistribution::CHROME_BROWSER ||
           type == BrowserDistribution::CHROME_FRAME);
@@ skipping 29 matching lines @@
 int BsdiffPatchFiles(const base::FilePath& src,
                      const base::FilePath& patch,
                      const base::FilePath& dest) {
   VLOG(1) << "Applying bsdiff patch " << patch.value()
           << " to file " << src.value()
           << " and generating file " << dest.value();
 
   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 ?

[huangs, 2016/06/03 05:12:05]

This was Frankenstein before: Using BSDiff from Courgette, but OK from BSPatch.
Having the bsdiff namespace is nice.

However, chrome/installer/setup/archive_patch_helper.cc still uses MBSPatch.  I
left it alone, but it's odd that Installer is using both Courgette and BSPatch
versions?

[grt (UTC plus 2), 2016/06/03 15:58:36]

Maybe we can get rid of the use of mbspatch in archive_patch_helper now. mmoss:
is my understanding correct that we now only build what was once called the
"3-stage" diff updater? Is there any reason not to ditch the code in Chrome that
handles the non-3-stage variant?

[Michael Moss, 2016/06/03 16:40:20]

Correct, we've only had 3-stage for many months now. There is still code to
generate the others, but it's disabled by default, and I'd be more than happy to
remove it entirely.

                         patch_status + kBsdiffErrorOffset : 0;
 
   LOG_IF(ERROR, exit_code)
       << "Failed to apply bsdiff patch " << patch.value()
       << " to file " << src.value() << " and generating file " << dest.value()
       << ". err=" << exit_code;
 
   return exit_code;
 }
 
@@ skipping 482 matching lines @@
 }
 
 ScopedTokenPrivilege::~ScopedTokenPrivilege() {
   if (is_enabled_ && previous_privileges_.PrivilegeCount != 0) {
     ::AdjustTokenPrivileges(token_.Get(), FALSE, &previous_privileges_,
                             sizeof(TOKEN_PRIVILEGES), NULL, NULL);
   }
 }
 
 }  // namespace installer