Differential updates for components.

chrome/installer/setup/setup_util.h

Index: chrome/installer/setup/setup_util.h
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 2a7530a24a1521764e612e32da8928ca3f3a89d5..9329272b60de08cc8bb1d483a781df272c9491c3 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -2,7 +2,9 @@
 // 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.
+// This file declares util functions for setup project. It also declares a
+// few functions that the Chrome component updater uses for patching binary
+// deltas.

[robertshield, 2013/06/17 16:39:28]

IMO, there's enough patch-related functionality in this file to make it worth
breaking the diff functions into a new pair of files. Perhaps
patch_helper.[h|cc]?

[Sorin Jianu, 2013/06/17 22:21:09]

My expectation is that the patching code will be hosted in a different way in
the next milestone. The patching code will be cross-platform at that time, so
dependencies on the setup.exe will likely be removed. If not, I will refactor
the code at that time. Will that work for you?

[robertshield, 2013/06/18 13:27:07]

sgtm

 
 #ifndef CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
 #define CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
@@ -28,15 +30,27 @@ class InstallationState;
 class InstallerState;
 class ProductState;
 
-// Apply a diff patch to source file. First tries to apply it using courgette
-// since it checks for courgette header and fails quickly. If that fails
-// tries to apply the patch using regular bsdiff. Returns status code.
+// Apply a diff patch to source file. First tries to apply it using Courgette
+// since it checks for Courgette header and fails quickly. If that fails
+// tries to apply the patch using regular bsdiff. Returns status code as
+// defined by the bsdiff code (see mbspatch.h for the definitions of the codes).

[robertshield, 2013/06/17 16:39:28]

please include the full path to mbspatch.h. It may get stale, but so may the
file name really, and it might help future readers find the file.

[Sorin Jianu, 2013/06/17 22:21:09]

Done.

 // The installer stage is updated if |installer_state| is non-NULL.
 int ApplyDiffPatch(const base::FilePath& src,
                    const base::FilePath& patch,
                    const base::FilePath& dest,
                    const InstallerState* installer_state);
 
+// Applies a patch file to source file using Courgette.
+int CourgettePatchFiles(const base::FilePath& src,
+                        const base::FilePath& patch,
+                        const base::FilePath& dest);
+
+// Applies a patch file to source file using bsdiff. This function uses
+// Courgette's flavor of bsdiff.
+int BsdiffPatchFiles(const base::FilePath& src,
+                     const base::FilePath& patch,
+                     const base::FilePath& dest);
+
 // Find the version of Chrome from an install source directory.
 // Chrome_path should contain at least one version folder.
 // Returns the maximum version found or NULL if no version is found.