Componentize component_updater: Split content::ResourceThrottle from CUS.

chrome/browser/component_updater/test/component_updater_service_unittest.cc

Index: chrome/browser/component_updater/test/component_updater_service_unittest.cc
diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
index 29e869cfef69fe5858a9d17afac7f22b6e02e385..23ce8654fff0276ca4dc17b5bf51ae1275384eb3 100644
--- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
@@ -12,6 +12,7 @@
 #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/browser/component_updater/component_updater_utils.h"
 #include "chrome/browser/component_updater/test/test_configurator.h"
 #include "chrome/browser/component_updater/test/test_installer.h"
@@ -141,7 +142,7 @@ void ComponentUpdaterTest::RunThreadsUntilIdle() {
 ComponentUpdateService::Status OnDemandTester::OnDemand(
     ComponentUpdateService* cus,
     const std::string& component_id) {
-  return cus->GetOnDemandUpdater().OnDemandUpdate(component_id);
+  return cus->OnDemandUpdate(component_id);
 }
 
 // Verify that our test fixture work and the component updater can
@@ -1190,9 +1191,7 @@ content::ResourceThrottle* RequestTestResourceThrottle(
                                   NULL,
                                   &context);
 
-  content::ResourceThrottle* rt =
-      cus->GetOnDemandUpdater().GetOnDemandResourceThrottle(&url_request,
-                                                            crx_id);
+  content::ResourceThrottle* rt = GetOnDemandResourceThrottle(cus, crx_id);
   rt->set_controller_for_testing(controller);
   controller->SetThrottle(rt);
   return rt;