Support asynchronous patching operations in the component updater.

chrome/browser/component_updater/component_patcher_operation.h

Index: chrome/browser/component_updater/component_patcher_operation.h
diff --git a/chrome/browser/component_updater/component_patcher_operation.h b/chrome/browser/component_updater/component_patcher_operation.h
index 6e9fe5be24c3ed0d2938734b559953ddec0d0458..d656e983336328cc5bbef38390d6b59672e99565 100644
--- a/chrome/browser/component_updater/component_patcher_operation.h
+++ b/chrome/browser/component_updater/component_patcher_operation.h
@@ -8,16 +8,19 @@
 #include <string>
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/files/file_path.h"
 #include "chrome/browser/component_updater/component_unpacker.h"
 
 namespace base {
 
-class FilePath;
 class DictionaryValue;
 
 }  // namespace base
 
 class ComponentInstaller;
+
+namespace component_updater {
+
 class ComponentPatcher;
 
 class DeltaUpdateOp {
@@ -29,7 +32,7 @@ class DeltaUpdateOp {
   // Parses, runs, and verifies the operation, returning an error code if an
   // error is encountered, and DELTA_OK otherwise. In case of errors,
   // extended error information can be returned in the |error| parameter.
-  ComponentUnpacker::Error Run(
+  component_updater::ComponentUnpacker::Error Run(

[Sorin Jianu, 2013/11/27 00:34:01]

namespace needed here and below?

[waffles, 2013/11/27 01:26:43]

Done.

       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       const base::FilePath& unpack_dir,
@@ -42,12 +45,12 @@ class DeltaUpdateOp {
   base::FilePath output_abs_path_;
 
  private:
-  ComponentUnpacker::Error CheckHash();
+  component_updater::ComponentUnpacker::Error CheckHash();
 
   // Subclasses must override DoParseArguments to parse operation-specific
   // arguments. DoParseArguments returns DELTA_OK on success; any other code
   // represents failure.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  virtual component_updater::ComponentUnpacker::Error DoParseArguments(
       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) = 0;
@@ -55,8 +58,9 @@ class DeltaUpdateOp {
   // Subclasses must override DoRun to actually perform the patching operation.
   // DoRun returns DELTA_OK on success; any other code represents failure.
   // Additional error information can be returned in the |error| parameter.
-  virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher,
-                                         int* error) = 0;
+  virtual component_updater::ComponentUnpacker::Error DoRun(
+      ComponentPatcher* patcher,
+      int* error) = 0;
 
   DISALLOW_COPY_AND_ASSIGN(DeltaUpdateOp);
 };
@@ -70,13 +74,14 @@ class DeltaUpdateOpCopy : public DeltaUpdateOp {
 
  private:
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  virtual component_updater::ComponentUnpacker::Error DoParseArguments(
       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) OVERRIDE;
 
-  virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher,
-                                         int* error) OVERRIDE;
+  virtual component_updater::ComponentUnpacker::Error DoRun(
+      ComponentPatcher* patcher,
+      int* error) OVERRIDE;
 
   base::FilePath input_abs_path_;
 
@@ -93,13 +98,14 @@ class DeltaUpdateOpCreate : public DeltaUpdateOp {
 
  private:
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  virtual component_updater::ComponentUnpacker::Error DoParseArguments(
       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) OVERRIDE;
 
-  virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher,
-                                         int* error) OVERRIDE;
+  virtual component_updater::ComponentUnpacker::Error DoRun(
+      ComponentPatcher* patcher,
+      int* error) OVERRIDE;
 
   base::FilePath patch_abs_path_;
 
@@ -115,13 +121,14 @@ class DeltaUpdateOpPatchBsdiff : public DeltaUpdateOp {
 
  private:
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  virtual component_updater::ComponentUnpacker::Error DoParseArguments(
       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) OVERRIDE;
 
-  virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher,
-                                         int* error) OVERRIDE;
+  virtual component_updater::ComponentUnpacker::Error DoRun(
+      ComponentPatcher* patcher,
+      int* error) OVERRIDE;
 
   base::FilePath patch_abs_path_;
   base::FilePath input_abs_path_;
@@ -138,13 +145,14 @@ class DeltaUpdateOpPatchCourgette : public DeltaUpdateOp {
 
  private:
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  virtual component_updater::ComponentUnpacker::Error DoParseArguments(
       base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) OVERRIDE;
 
-  virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher,
-                                         int* error) OVERRIDE;
+  virtual component_updater::ComponentUnpacker::Error DoRun(
+      ComponentPatcher* patcher,
+      int* error) OVERRIDE;
 
   base::FilePath patch_abs_path_;
   base::FilePath input_abs_path_;
@@ -155,4 +163,6 @@ class DeltaUpdateOpPatchCourgette : public DeltaUpdateOp {
 // Factory function to create DeltaUpdateOp instances.
 DeltaUpdateOp* CreateDeltaUpdateOp(base::DictionaryValue* command);
 
+}  // namespace component_updater
+
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_PATCHER_OPERATION_H_