Merge 8401001 r107836 into branch 912: Fix history importing by delaying DownloadManager creation.

content/shell/shell_resource_context.cc

Index: content/shell/shell_resource_context.cc
===================================================================
--- content/shell/shell_resource_context.cc	(revision 108294)
+++ content/shell/shell_resource_context.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "content/shell/shell_resource_context.h"
 
 #include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/shell/shell_url_request_context_getter.h"
 
 namespace content {
@@ -12,10 +13,10 @@
 ShellResourceContext::ShellResourceContext(
     ShellURLRequestContextGetter* getter,
     ChromeBlobStorageContext* blob_storage_context,
-    DownloadManager::GetNextIdThunkType next_download_id_thunk)
+    DownloadIdFactory* download_id_factory)
     : getter_(getter),
       blob_storage_context_(blob_storage_context),
-      next_download_id_thunk_(next_download_id_thunk) {
+      download_id_factory_(download_id_factory) {
 }
 
 ShellResourceContext::~ShellResourceContext() {
@@ -29,7 +30,7 @@
   set_request_context(getter_->GetURLRequestContext());
   set_host_resolver(getter_->host_resolver());
   set_blob_storage_context(blob_storage_context_);
-  set_next_download_id_thunk(next_download_id_thunk_);
+  set_download_id_factory(download_id_factory_);
 }
 
 }  // namespace content