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

content/browser/resource_context.h

Index: content/browser/resource_context.h
===================================================================
--- content/browser/resource_context.h	(revision 108294)
+++ content/browser/resource_context.h	(working copy)
@@ -11,10 +11,10 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "content/browser/download/download_manager.h"
 
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
+class DownloadIdFactory;
 class ExtensionInfoMap;
 class HostZoomMap;
 class MediaObserver;
@@ -77,10 +77,8 @@
   MediaObserver* media_observer() const;
   void set_media_observer(MediaObserver* media_observer);
 
-  // TODO(benjhayden): Promote GetNextIdThunkType to a separate object.
-  const DownloadManager::GetNextIdThunkType& next_download_id_thunk() const;
-  void set_next_download_id_thunk(
-      const DownloadManager::GetNextIdThunkType& thunk);
+  DownloadIdFactory* download_id_factory() const;
+  void set_download_id_factory(DownloadIdFactory* download_id_factory);
 
   media_stream::MediaStreamManager* media_stream_manager() const;
   void set_media_stream_manager(
@@ -101,7 +99,7 @@
   quota::QuotaManager* quota_manager_;
   HostZoomMap* host_zoom_map_;
   MediaObserver* media_observer_;
-  DownloadManager::GetNextIdThunkType next_download_id_thunk_;
+  DownloadIdFactory* download_id_factory_;
   media_stream::MediaStreamManager* media_stream_manager_;
 
   // Externally-defined data accessible by key.