Replace the DownloadFileManager with direct ownership of DownloadFileImpl

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"
 
 #if !defined(OS_IOS)
 #include "content/browser/appcache/chrome_appcache_service.h"
-#include "webkit/database/database_tracker.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
-#include "content/browser/download/download_file_manager.h"
+#include "content/browser/download/download_file_factory.h"
+#include "content/browser/download/download_item_factory.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
-#include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/browser/storage_partition_impl_map.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.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 "net/url_request/url_request_context_getter.h"
+#include "webkit/database/database_tracker.h"
 #endif // !OS_IOS
 
 using base::UserDataAdapter;
 
 namespace content {
 
 // Only ~BrowserContext() is needed on iOS.
 #if !defined(OS_IOS)
 namespace {
 
@@ skipping 43 matching lines @@
 }
 
 }  // namespace
 
 DownloadManager* BrowserContext::GetDownloadManager(
     BrowserContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!context->GetUserData(kDownloadManagerKeyName)) {
     ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
     DCHECK(rdh);
-    DownloadFileManager* file_manager = rdh->download_file_manager();
-    DCHECK(file_manager);
     scoped_refptr<DownloadManager> download_manager =
         new DownloadManagerImpl(
-            file_manager,
             scoped_ptr<DownloadItemFactory>(),

[benjhayden, 2012/09/24 17:43:27]

Would it make more sense to not pass the factories into the ctor, and instead
provide setters for the factories?
If the factories are only overloaded in tests, you could name the setters
*ForTest().

[Randy Smith (Not in Mondays), 2012/09/26 21:01:05]

Yeah, I think this makes sense.  Done.

+            scoped_ptr<DownloadFileFactory>(),
             GetContentClient()->browser()->GetNetLog());
 
     context->SetUserData(
         kDownloadManagerKeyName,
         new UserDataAdapter<DownloadManager>(download_manager));
     download_manager->SetDelegate(context->GetDownloadManagerDelegate());
     download_manager->Init(context);
   }
 
   return UserDataAdapter<DownloadManager>::Get(
@@ skipping 99 matching lines @@
 #endif  // !OS_IOS
 
 BrowserContext::~BrowserContext() {
 #if !defined(OS_IOS)
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 #endif
 }
 
 }  // namespace content