Move most of the component updater artifacts to update_client.

chrome/browser/component_updater/test/component_updater_service_unittest.cc

 // Copyright 2012 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/test/component_updater_service_unittest.h"
 
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_resource_throttle.h"
 #include "chrome/common/chrome_paths.h"
-#include "components/component_updater/component_updater_utils.h"
-#include "components/component_updater/test/test_configurator.h"
-#include "components/component_updater/test/test_installer.h"
-#include "components/component_updater/test/url_request_post_interceptor.h"
+#include "components/update_client/test/test_configurator.h"
+#include "components/update_client/test/test_installer.h"
+#include "components/update_client/test/url_request_post_interceptor.h"
+#include "components/update_client/utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/resource_throttle.h"
 #include "libxml/globals.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/url_request/test_url_request_interceptor.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using std::string;
 
+using update_client::CrxComponent;
+using update_client::PartialMatch;
+using update_client::InterceptorFactory;
+using update_client::TestConfigurator;
+using update_client::TestInstaller;
+using update_client::URLRequestPostInterceptor;
+using update_client::VersionedTestInstaller;
+
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Mock;
 
+using update_client::abag_hash;
+using update_client::ihfo_hash;
+using update_client::jebg_hash;
+
 namespace component_updater {
 
 MockServiceObserver::MockServiceObserver() {
 }
 
 MockServiceObserver::~MockServiceObserver() {
 }
 
 ComponentUpdaterTest::ComponentUpdaterTest()
     : post_interceptor_(NULL),
@@ skipping 30 matching lines @@
 }
 
 ComponentUpdateService* ComponentUpdaterTest::component_updater() {
   return component_updater_.get();
 }
 
 // Makes the full path to a component updater test file.
 const base::FilePath ComponentUpdaterTest::test_file(const char* file) {
   base::FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
-  return path.AppendASCII("components").AppendASCII("test").AppendASCII("data")
-      .AppendASCII("component_updater").AppendASCII(file);
+  return path.AppendASCII("components")
+      .AppendASCII("test")
+      .AppendASCII("data")
+      .AppendASCII("update_client")
+      .AppendASCII(file);
 }
 
 TestConfigurator* ComponentUpdaterTest::test_configurator() {
   return test_config_;
 }
 
 ComponentUpdateService::Status ComponentUpdaterTest::RegisterComponent(
     CrxComponent* com,
     TestComponents component,
     const Version& version,
@@ skipping 1386 matching lines @@
   component_updater()->RemoveObserver(&observer2);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   component_updater()->Stop();
 }
 
 }  // namespace component_updater