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

content/browser/download/download_manager_impl.cc

 // Copyright (c) 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 "content/browser/download/download_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 58 matching lines @@
   resource_dispatcher_host->BeginDownload(
       request, save_info, true,
       DownloadResourceHandler::OnStartedCallback(),
       render_params.render_process_id_,
       render_params.render_view_id_,
       *context);
 }
 
 }  // namespace
 
+namespace content {
+
+// static
+DownloadManager* DownloadManager::Create(
+      content::DownloadManagerDelegate* delegate,
+      DownloadIdFactory* id_factory,
+      DownloadStatusUpdater* status_updater) {
+  return new DownloadManagerImpl(delegate, id_factory, status_updater);
+}
+
+}  // namespace content
+
 DownloadManagerImpl::DownloadManagerImpl(
     content::DownloadManagerDelegate* delegate,
     DownloadIdFactory* id_factory,
     DownloadStatusUpdater* status_updater)
         : shutdown_needed_(false),
           browser_context_(NULL),
           file_manager_(NULL),
           status_updater_((status_updater != NULL)
                           ? status_updater->AsWeakPtr()
                           : base::WeakPtr<DownloadStatusUpdater>()),
@@ skipping 138 matching lines @@
 }
 
 // Query the history service for information about all persisted downloads.
 bool DownloadManagerImpl::Init(content::BrowserContext* browser_context) {
   DCHECK(browser_context);
   DCHECK(!shutdown_needed_)  << "DownloadManager already initialized.";
   shutdown_needed_ = true;
 
   browser_context_ = browser_context;
 
-  // In test mode, there may be no ResourceDispatcherHost.  In this case it's
-  // safe to avoid setting |file_manager_| because we only call a small set of
-  // functions, none of which need it.
-  ResourceDispatcherHost* rdh =
-      content::GetContentClient()->browser()->GetResourceDispatcherHost();
-  if (rdh) {
-    file_manager_ = rdh->download_file_manager();
-    DCHECK(file_manager_);
-  }
+  file_manager_ = ResourceDispatcherHost::Get()->download_file_manager();
+  DCHECK(file_manager_);
 
   return true;
 }
 
 // We have received a message from DownloadFileManager about a new download.
 void DownloadManagerImpl::StartDownload(int32 download_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (delegate_->ShouldStartDownload(download_id))
     RestartDownload(download_id);
@@ skipping 508 matching lines @@
   DownloadUrlToFile(url, referrer, referrer_charset, DownloadSaveInfo(),
                     web_contents);
 }
 
 void DownloadManagerImpl::DownloadUrlToFile(const GURL& url,
                                             const GURL& referrer,
                                             const std::string& referrer_charset,
                                             const DownloadSaveInfo& save_info,
                                             WebContents* web_contents) {
   ResourceDispatcherHost* resource_dispatcher_host =
-      content::GetContentClient()->browser()->GetResourceDispatcherHost();
+      ResourceDispatcherHost::Get();
 
   // We send a pointer to content::ResourceContext, instead of the usual
   // reference, so that a copy of the object isn't made.
   // base::Bind can't handle 7 args, so we use URLParams and RenderParams.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
           URLParams(url, referrer), save_info, resource_dispatcher_host,
           RenderParams(web_contents->GetRenderProcessHost()->GetID(),
                        web_contents->GetRenderViewHost()->routing_id()),
@@ skipping 352 matching lines @@
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }