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

content/browser/resource_context.cc

Index: content/browser/resource_context.cc
===================================================================
--- content/browser/resource_context.cc	(revision 108294)
+++ content/browser/resource_context.cc	(working copy)
@@ -153,16 +153,15 @@
   media_observer_ = media_observer;
 }
 
-const DownloadManager::GetNextIdThunkType&
-ResourceContext::next_download_id_thunk() const {
+DownloadIdFactory* ResourceContext::download_id_factory() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
-  return next_download_id_thunk_;
+  return download_id_factory_;
 }
-void ResourceContext::set_next_download_id_thunk(
-    const DownloadManager::GetNextIdThunkType& thunk) {
+void ResourceContext::set_download_id_factory(
+    DownloadIdFactory* download_id_factory) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  next_download_id_thunk_ = thunk;
+  download_id_factory_ = download_id_factory;
 }
 
 media_stream::MediaStreamManager*