Componentize component_updater: Split content::ResourceThrottle from CUS.

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 <vector>
 
 #include "chrome/browser/component_updater/test/component_updater_service_unittest.h"
 #include "base/file_util.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/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"
 #include "chrome/common/chrome_paths.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"
@@ skipping 109 matching lines @@
   RunThreadsUntilIdle();
 }
 
 void ComponentUpdaterTest::RunThreadsUntilIdle() {
   base::RunLoop().RunUntilIdle();
 }
 
 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
 // be created and destroyed with no side effects.
 TEST_F(ComponentUpdaterTest, VerifyFixture) {
   EXPECT_TRUE(component_updater() != NULL);
 }
 
 // Verify that the component updater can be caught in a quick
 // start-shutdown situation. Failure of this test will be a crash.
@@ skipping 1028 matching lines @@
 content::ResourceThrottle* RequestTestResourceThrottle(
     ComponentUpdateService* cus,
     TestResourceController* controller,
     const char* crx_id) {
   net::TestURLRequestContext context;
   net::TestURLRequest url_request(GURL("http://foo.example.com/thing.bin"),
                                   net::DEFAULT_PRIORITY,
                                   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;
 }
 
 void RequestAndDeleteResourceThrottle(ComponentUpdateService* cus,
                                       const char* crx_id) {
   // By requesting a throttle and deleting it immediately we ensure that we
   // hit the case where the component updater tries to use the weak
   // pointer to a dead Resource throttle.
@@ skipping 284 matching lines @@
   component_updater()->RemoveObserver(&observer2);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   component_updater()->Stop();
 }
 
 }  // namespace component_updater