Refactor downloads into a ProfileKeyedService.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9227a3ca4a371c119b6bbff6d89632a66da1f362..7c3dc72384763b2b4172abcb9eae06a4c38dfca5 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -26,7 +26,8 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/download/chrome_download_manager_delegate.h"
+#include "chrome/browser/download/download_service.h"
+#include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
@@ -330,7 +331,6 @@ ProfileImpl::ProfileImpl(const FilePath& path,
       favicon_service_created_(false),
       created_web_data_service_(false),
       created_password_store_(false),
-      created_download_manager_(false),
       start_time_(Time::Now()),
 #if defined(OS_WIN)
       checked_instant_promo_(false),
@@ -729,14 +729,6 @@ ProfileImpl::~ProfileImpl() {
             &webkit_database::DatabaseTracker::Shutdown));
   }
 
-  // DownloadManager is lazily created, so check before accessing it.
-  if (download_manager_.get()) {
-    // The download manager queries the history system and should be shut down
-    // before the history is shut down so it can properly cancel all requests.
-    download_manager_->Shutdown();
-    download_manager_ = NULL;
-  }
-
   // Password store uses WebDB, shut it down before the WebDB has been shutdown.
   if (password_store_.get())
     password_store_->Shutdown();
@@ -1301,23 +1293,7 @@ void ProfileImpl::CreatePasswordStore() {
 }
 
 DownloadManager* ProfileImpl::GetDownloadManager() {
-  if (!created_download_manager_) {
-    // In case the delegate has already been set by SetDownloadManagerDelegate.
-    if (!download_manager_delegate_.get())
-      download_manager_delegate_= new ChromeDownloadManagerDelegate(this);
-    scoped_refptr<DownloadManager> dlm(
-        new DownloadManager(download_manager_delegate_,
-                            g_browser_process->download_status_updater()));
-    dlm->Init(this);
-    download_manager_delegate_->SetDownloadManager(dlm);
-    created_download_manager_ = true;
-    download_manager_.swap(dlm);
-  }
-  return download_manager_.get();
-}
-
-bool ProfileImpl::HasCreatedDownloadManager() const {
-  return created_download_manager_;
+  return DownloadServiceFactory::GetForProfile(this)->GetDownloadManager();
 }
 
 fileapi::FileSystemContext* ProfileImpl::GetFileSystemContext() {
@@ -1779,7 +1755,3 @@ SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   return spellcheck_profile_.get();
 }
 
-void ProfileImpl::SetDownloadManagerDelegate(
-    ChromeDownloadManagerDelegate* delegate) {
-  download_manager_delegate_ = delegate;
-}