Move most of the component updater artifacts to update_client.

components/update_client/component_patcher.cc

 // Copyright 2014 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 "components/component_updater/component_patcher.h"
+#include "components/update_client/component_patcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
-#include "components/component_updater/component_patcher_operation.h"
-#include "components/component_updater/component_updater_service.h"
+#include "components/update_client/component_patcher_operation.h"
 
-namespace component_updater {
+namespace update_client {
 
 namespace {
 
 // Deserialize the commands file (present in delta update packages). The top
 // level must be a list.
 base::ListValue* ReadCommands(const base::FilePath& unpack_path) {
   const base::FilePath commands =
       unpack_path.Append(FILE_PATH_LITERAL("commands.json"));
   if (!base::PathExists(commands))
     return NULL;
@@ skipping 56 matching lines @@
   std::string operation;
   if (command_args->GetString(kOp, &operation)) {
     current_operation_ =
         CreateDeltaUpdateOp(operation, out_of_process_patcher_);
   }
 
   if (!current_operation_.get()) {
     DonePatching(ComponentUnpacker::kDeltaUnsupportedCommand, 0);
     return;
   }
-  current_operation_->Run(command_args,
-                          input_dir_,
-                          unpack_dir_,
-                          installer_,
+  current_operation_->Run(command_args, input_dir_, unpack_dir_, installer_,
                           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
+}  // namespace update_client