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

content/browser/browser_context.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/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
+#include "content/browser/download/download_manager_impl.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/server_bound_cert_store.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
 using quota::QuotaManager;
 using webkit_database::DatabaseTracker;
 
 // Key names on BrowserContext.
 static const char* kAppCacheServicKeyName = "content_appcache_service_tracker";
 static const char* kDatabaseTrackerKeyName = "content_database_tracker";
 static const char* kDOMStorageContextKeyName = "content_dom_storage_context";
+static const char* kDownloadManagerKeyName = "download_manager";
 static const char* kFileSystemContextKeyName = "content_file_system_context";
 static const char* kIndexedDBContextKeyName = "content_indexed_db_context";
 static const char* kQuotaManagerKeyName = "content_quota_manager";
 
 namespace content {
 
 namespace {
 
 void CreateQuotaManagerAndClients(BrowserContext* context) {
   if (context->GetUserData(kQuotaManagerKeyName)) {
@@ skipping 86 matching lines @@
   ResourceContext::GetAppCacheService(resource_context)->PurgeMemory();
 }
 
 DOMStorageContextImpl* GetDOMStorageContextImpl(BrowserContext* context) {
   return static_cast<DOMStorageContextImpl*>(
       BrowserContext::GetDOMStorageContext(context));
 }
 
 }  // namespace
 
+DownloadManager* BrowserContext::GetDownloadManager(

[Avi (use Gerrit), 2012/06/05 23:34:41]

This DCHECKs if you call it more than once? Don't you call it all over the
place?

[jam, 2012/06/05 23:47:16]

I hadn't tested it yet (was parallelizing review+testing) :) fixed, verified
basic downloading now but going through all the tests still.

+    BrowserContext* context) {
+  DCHECK(!context->GetUserData(kDownloadManagerKeyName));
+  scoped_refptr<DownloadManager> download_manager = new DownloadManagerImpl(
+      GetContentClient()->browser()->GetNetLog());
+  download_manager->Init(context);
+  context->SetUserData(kDownloadManagerKeyName,
+                       new UserDataAdapter<DownloadManager>(download_manager));
+  return download_manager;
+}
+
 QuotaManager* BrowserContext::GetQuotaManager(BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<QuotaManager>::Get(context, kQuotaManagerKeyName);
 }
 
 DOMStorageContext* BrowserContext::GetDOMStorageContext(
     BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<DOMStorageContextImpl>::Get(
       context, kDOMStorageContextKeyName);
@@ skipping 76 matching lines @@
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&webkit_database::DatabaseTracker::Shutdown,
                    GetDatabaseTracker(this)));
   }
 
   if (GetUserData(kDOMStorageContextKeyName))
     GetDOMStorageContextImpl(this)->Shutdown();
 }
 
 }  // namespace content