Move creation and ownership of DownloadManager from the embedder to content. This matches all the o…

chrome/browser/plugin_installer.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 "chrome/browser/plugin_installer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_installer_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_save_info.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/url_request/url_request.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
+using content::DownloadManager;
 using content::ResourceDispatcherHost;
 
 namespace {
 
 void BeginDownload(
     const GURL& url,
     content::ResourceContext* resource_context,
     int render_process_host_id,
     int render_view_host_routing_id,
     const ResourceDispatcherHost::DownloadStartedCallback& callback) {
@@ skipping 144 matching lines @@
     WeakPluginInstallerObserver* observer) {
   weak_observers_.RemoveObserver(observer);
 }
 
 void PluginInstaller::StartInstalling(TabContentsWrapper* wrapper) {
   DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
   DCHECK(!url_for_display_);
   state_ = INSTALLER_STATE_DOWNLOADING;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted());
   content::WebContents* web_contents = wrapper->web_contents();
-  DownloadService* download_service =
-      DownloadServiceFactory::GetForProfile(wrapper->profile());
+  DownloadManager* download_manager =
+      BrowserContext::GetDownloadManager(wrapper->profile());
   download_util::RecordDownloadSource(
       download_util::INITIATED_BY_PLUGIN_INSTALLER);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
                  plugin_url_,
                  wrapper->profile()->GetResourceContext(),
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID(),
                  base::Bind(&PluginInstaller::DownloadStarted,
                             base::Unretained(this),
-                            make_scoped_refptr(
-                                download_service->GetDownloadManager()))));
+                            make_scoped_refptr(download_manager))));
 }
 
 void PluginInstaller::DownloadStarted(
     scoped_refptr<content::DownloadManager> dlm,
     content::DownloadId download_id,
     net::Error error) {
   if (error != net::OK) {
     std::string msg =
         base::StringPrintf("Error %d: %s", error, net::ErrorToString(error));
     DownloadError(msg);
@@ skipping 20 matching lines @@
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg));
 }
 
 void PluginInstaller::DownloadCancelled() {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
 }