Differential updates for components.

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 ef0f836039beefc75af561bc93b24801e9771385..ad5e02ccf90ebea45c1fa0c3354ece76b3eda6b8 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -24,6 +24,7 @@
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
 #include "courgette/courgette.h"
+#include "courgette/third_party/bsdiff.h"
 #include "third_party/bspatch/mbspatch.h"
 
 namespace installer {
@@ -86,12 +87,51 @@ bool SupportsSingleInstall(BrowserDistribution::Type type) {
 
 }  // namespace
 
+int CourgettePatchFiles(const base::FilePath& src,
+                        const base::FilePath& patch,
+                        const base::FilePath& dest) {
+  LOG(WARNING) << "Applying Courgette patch " << patch.value() << " to file "

[grt (UTC plus 2), 2013/06/20 14:04:14]

Seems like an "installer logging" style guide is in order. :-)

My inclination is for status messages like this to be VLOG(1), and for true
errors to be LOG(ERROR). That in mind, please change this, line 114, and line
133 back to VLOG(1). Apologies for the lack of clarity.

[Sorin Jianu, 2013/06/20 17:40:15]

Done.

+          << src.value() << " and generating file " << dest.value();
+
+  if (src.empty() || patch.empty() || dest.empty())
+     return installer::PATCH_INVALID_ARGUMENTS;

[grt (UTC plus 2), 2013/06/20 14:04:14]

nit: only indent two spaces

[Sorin Jianu, 2013/06/20 17:40:15]

Done.

+
+  const courgette::Status patch_status =
+      courgette::ApplyEnsemblePatch(src.value().c_str(),
+                                    patch.value().c_str(),
+                                    dest.value().c_str());
+  const int exit_code = (patch_status != courgette::C_OK) ?
+      static_cast<int>(patch_status) + kCourgetteErrorOffset : 0;
+
+  LOG_IF(ERROR, exit_code) << "Failed to apply patch " << patch.value()
+                           << ". err=" << exit_code;
+  return exit_code;
+}
+
+int BsdiffPatchFiles(const base::FilePath& src,
+                     const base::FilePath& patch,
+                     const base::FilePath& dest) {
+  LOG(WARNING) << "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;

[grt (UTC plus 2), 2013/06/20 14:04:14]

nit: only indent two spaces

[Sorin Jianu, 2013/06/20 17:40:15]

Done.

+
+  const int patch_status = courgette::ApplyBinaryPatch(src, patch, dest);
+  const int exit_code = patch_status ?
+                        patch_status + kBsdiffErrorOffset : 0;
+
+  LOG_IF(ERROR, exit_code) << "Failed to apply patch " << patch.value()
+                           << ". err=" << exit_code;
+  return exit_code;
+}
+
 int ApplyDiffPatch(const base::FilePath& src,
                    const base::FilePath& patch,
                    const base::FilePath& dest,
                    const InstallerState* installer_state) {
-  VLOG(1) << "Applying patch " << patch.value() << " to file " << src.value()
-          << " and generating file " << dest.value();
+  LOG(WARNING) << "Applying patch " << patch.value() << " to file "
+               << src.value() << " and generating file " << dest.value();
 
   if (installer_state != NULL)
     installer_state->UpdateStage(installer::ENSEMBLE_PATCHING);
@@ -105,8 +145,8 @@ int ApplyDiffPatch(const base::FilePath& src,
   if (patch_status == courgette::C_OK)
     return 0;
 
-  VLOG(1) << "Failed to apply patch " << patch.value()
-          << " using courgette. err=" << patch_status;
+  LOG(ERROR) << "Failed to apply patch " << patch.value()
+             << " using courgette. err=" << patch_status;
 
   // If we ran out of memory or disk space, then these are likely the errors
   // we will see.  If we run into them, return an error and stay on the
@@ -119,8 +159,14 @@ int ApplyDiffPatch(const base::FilePath& src,
   if (installer_state != NULL)
     installer_state->UpdateStage(installer::BINARY_PATCHING);
 
-  return ApplyBinaryPatch(src.value().c_str(), patch.value().c_str(),
-                          dest.value().c_str());
+  int binary_patch_status = ApplyBinaryPatch(src.value().c_str(),
+                                             patch.value().c_str(),
+                                             dest.value().c_str());
+
+  LOG_IF(ERROR, binary_patch_status != OK) << "Failed to apply patch "
+      << patch.value() << " using bsdiff. err=" << binary_patch_status;
+
+  return binary_patch_status;
 }
 
 Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) {