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

content/shell/shell_resource_context.h

Index: content/shell/shell_resource_context.h
===================================================================
--- content/shell/shell_resource_context.h	(revision 108294)
+++ content/shell/shell_resource_context.h	(working copy)
@@ -8,10 +8,10 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "content/browser/download/download_manager.h"
 #include "content/browser/resource_context.h"
 
 class ChromeBlobStorageContext;
+class DownloadIdFactory;
 
 namespace content {
 
@@ -22,7 +22,7 @@
   ShellResourceContext(
       ShellURLRequestContextGetter* getter,
       ChromeBlobStorageContext* blob_storage_context,
-      DownloadManager::GetNextIdThunkType next_download_id_thunk);
+      DownloadIdFactory* download_id_factory);
   virtual ~ShellResourceContext();
 
  private:
@@ -32,7 +32,7 @@
 
   scoped_refptr<ShellURLRequestContextGetter> getter_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
-  DownloadManager::GetNextIdThunkType next_download_id_thunk_;
+  scoped_refptr<DownloadIdFactory> download_id_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellResourceContext);
 };