Move most of the component updater artifacts to update_client.

components/component_updater/default_component_installer.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/values.h"
 #include "base/version.h"
 // TODO(ddorwin): Find a better place for ReadManifest.
-#include "components/component_updater/component_unpacker.h"
-#include "components/component_updater/component_updater_configurator.h"
+#include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/default_component_installer.h"
+#include "components/update_client/component_unpacker.h"
+#include "components/update_client/update_client.h"
+
+using update_client::CrxComponent;
 
 namespace component_updater {
 
 namespace {
 // Version "0" corresponds to no installed version. By the server's conventions,
 // we represent it as a dotted quad.
 const char kNullVersion[] = "0.0.0.0";
 }  // namespace
 
 ComponentInstallerTraits::~ComponentInstallerTraits() {
@@ skipping 118 matching lines @@
     if (!version.IsValid())
       continue;
 
     // |version| not newer than the latest found version (kNullVersion if no
     // version has been found yet) is marked for removal.
     if (version.CompareTo(latest_version) <= 0) {
       older_paths.push_back(path);
       continue;
     }
 
-    scoped_ptr<base::DictionaryValue> manifest = ReadManifest(path);
+    scoped_ptr<base::DictionaryValue> manifest =
+        update_client::ReadManifest(path);
     if (!manifest || !installer_traits_->VerifyInstallation(*manifest, path)) {
       DLOG(ERROR) << "Failed to read manifest or verify installation for "
                   << installer_traits_->GetName() << " ("
                   << path.MaybeAsASCII() << ").";
       older_paths.push_back(path);
       continue;
     }
 
     // New valid |version| folder found!
 
@@ skipping 55 matching lines @@
   if (!current_manifest_)
     return;
 
   scoped_ptr<base::DictionaryValue> manifest_copy(
       current_manifest_->DeepCopy());
   installer_traits_->ComponentReady(
       current_version_, GetInstallDirectory(), manifest_copy.Pass());
 }
 
 }  // namespace component_updater