Refactor downloads into a ProfileKeyedService.

chrome/browser/profiles/profile_impl.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 "chrome/browser/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #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"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_navigation_observer.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_settings_backend.h"
@@ skipping 47 matching lines @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/chrome_blob_storage_context.h"
-#include "content/browser/download/download_manager.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/speech/speech_input_manager.h"
 #include "content/browser/ssl/ssl_host_state.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/locale_change_guard.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #endif
 
+class DownloadManager;

[jam, 2011/10/11 19:31:13]

this isn't needed

[Randy Smith (Not in Mondays), 2011/10/11 20:28:27]

Done.

+
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 // Delay, in milliseconds, before we explicitly create the SessionService.
 static const int kCreateSessionServiceDelayMS = 500;
 
 #if defined(OS_MACOSX)
 // Capacity for mock keychain used for testing.
@@ skipping 173 matching lines @@
     : path_(path),
       visited_link_event_listener_(new VisitedLinkEventListener()),
       extension_devtools_manager_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       host_content_settings_map_(NULL),
       host_zoom_map_(NULL),
       history_service_created_(false),
       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),
 #endif
       delegate_(delegate),
       predictor_(NULL) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
   create_session_service_timer_.Start(FROM_HERE,
@@ skipping 378 matching lines @@
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
   if (db_tracker_) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             db_tracker_.get(),
             &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();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
   // decrement the refcount, it won't be 0, and the threads/databases aren't
   // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
   // databases are properly closed.
@@ skipping 546 matching lines @@
     delete login_db;
 
   if (!ps || !ps->Init()) {
     NOTREACHED() << "Could not initialize password manager.";
     return;
   }
   password_store_.swap(ps);
 }
 
 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() {
   CreateQuotaManagerAndClients();
   return file_system_context_.get();
 }
 
 quota::QuotaManager* ProfileImpl::GetQuotaManager() {
   CreateQuotaManagerAndClients();
   return quota_manager_.get();
@@ skipping 423 matching lines @@
 
 void ProfileImpl::DeleteTransportSecurityStateSince(base::Time time) {
   io_data_.DeleteTransportSecurityStateSince(time);
 }
 
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }
-
-void ProfileImpl::SetDownloadManagerDelegate(
-    ChromeDownloadManagerDelegate* delegate) {
-  download_manager_delegate_ = delegate;
-}