Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2011 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/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 79 matching lines @@
 }
 
 // Collect the information from FILE and IO threads needed for the Cancel
 // Test, specifically the number of outstanding requests on the
 // ResourceDispatcherHost and the number of pending downloads on the
 // DownloadFileManager.
 class CancelTestDataCollector
     : public base::RefCountedThreadSafe<CancelTestDataCollector> {
  public:
   CancelTestDataCollector()
-      : resource_dispatcher_host_(
-          g_browser_process->resource_dispatcher_host()),
-        slow_download_job_pending_requests_(0),
+      : slow_download_job_pending_requests_(0),
         dfm_pending_downloads_(0) { }
 
   void WaitForDataCollected() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&CancelTestDataCollector::IOInfoCollector, this));
     ui_test_utils::RunMessageLoop();
   }
 
   int slow_download_job_pending_requests() const {
     return slow_download_job_pending_requests_;
   }
 
   int dfm_pending_downloads() const { return dfm_pending_downloads_; }
 
  protected:
   friend class base::RefCountedThreadSafe<CancelTestDataCollector>;
 
   virtual ~CancelTestDataCollector() {}
 
  private:
 
   void IOInfoCollector() {
-    download_file_manager_ = resource_dispatcher_host_->download_file_manager();
+    download_file_manager_ =
+        ResourceDispatcherHost::Get()->download_file_manager();
     slow_download_job_pending_requests_ =
         URLRequestSlowDownloadJob::NumberOutstandingRequests();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&CancelTestDataCollector::FileInfoCollector, this));
   }
 
   void FileInfoCollector() {
     dfm_pending_downloads_ = download_file_manager_->NumberOfActiveDownloads();
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure());
   }
 
-  ResourceDispatcherHost* resource_dispatcher_host_;
   DownloadFileManager* download_file_manager_;
   int slow_download_job_pending_requests_;
   int dfm_pending_downloads_;
 
   DISALLOW_COPY_AND_ASSIGN(CancelTestDataCollector);
 };
 
 class PickSuggestedFileDelegate : public ChromeDownloadManagerDelegate {
  public:
   explicit PickSuggestedFileDelegate(Profile* profile)
@@ skipping 1580 matching lines @@
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   ASSERT_TRUE(CheckDownloadFullPaths(browser(),
                                      target_file_full_path,
                                      OriginFile(file)));
 
   // Temporary downloads won't be visible.
   CheckDownloadUI(browser(), false, false, file);
 }