Componentize component_updater: Decouple in-process DeltaUpdateOp from out-of-process version.

chrome/browser/component_updater/component_patcher.cc

 // Copyright 2013 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 "chrome/browser/component_updater/component_patcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
              ? static_cast<base::ListValue*>(root.release())
              : NULL;
 }
 
 }  // namespace
 
 ComponentPatcher::ComponentPatcher(
     const base::FilePath& input_dir,
     const base::FilePath& unpack_dir,
     ComponentInstaller* installer,
-    bool in_process,
+    scoped_refptr<OutOfProcessPatcher> out_of_process_patcher,
     scoped_refptr<base::SequencedTaskRunner> task_runner)
     : input_dir_(input_dir),
       unpack_dir_(unpack_dir),
       installer_(installer),
-      in_process_(in_process),
+      out_of_process_patcher_(out_of_process_patcher),
       task_runner_(task_runner) {
 }
 
 ComponentPatcher::~ComponentPatcher() {
 }
 
 void ComponentPatcher::Start(const ComponentUnpacker::Callback& callback) {
   callback_ = callback;
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(&ComponentPatcher::StartPatching,
@@ skipping 14 matching lines @@
   if (next_command_ == commands_->end()) {
     DonePatching(ComponentUnpacker::kNone, 0);
     return;
   }
   if (!(*next_command_)->IsType(base::Value::TYPE_DICTIONARY)) {
     DonePatching(ComponentUnpacker::kDeltaBadCommands, 0);
     return;
   }
   const base::DictionaryValue* command_args =
       static_cast<base::DictionaryValue*>(*next_command_);
-  current_operation_ = CreateDeltaUpdateOp(*command_args);
+
+  std::string operation;
+  if (command_args->GetString(kOp, &operation)) {
+    current_operation_ =
+        CreateDeltaUpdateOp(operation, out_of_process_patcher_);
+  }
+
   if (!current_operation_) {
     DonePatching(ComponentUnpacker::kDeltaUnsupportedCommand, 0);
     return;
   }
   current_operation_->Run(command_args,
                           input_dir_,
                           unpack_dir_,
                           installer_,
-                          in_process_,
                           base::Bind(&ComponentPatcher::DonePatchingFile,
                                      scoped_refptr<ComponentPatcher>(this)),
                           task_runner_);
 }
 
 void ComponentPatcher::DonePatchingFile(ComponentUnpacker::Error error,
                                         int extended_error) {
   if (error != ComponentUnpacker::kNone) {
     DonePatching(error, extended_error);
   } else {
     ++next_command_;
     PatchNextFile();
   }
 }
 
 void ComponentPatcher::DonePatching(ComponentUnpacker::Error error,
                                     int extended_error) {
   current_operation_ = NULL;
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(callback_, error, extended_error));
   callback_.Reset();
 }
 
 }  // namespace component_updater