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

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
===================================================================
--- chrome/browser/profiles/profile_io_data.h	(revision 108294)
+++ chrome/browser/profiles/profile_io_data.h	(working copy)
@@ -16,7 +16,6 @@
 #include "base/synchronization/lock.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "content/browser/download/download_manager.h"
 #include "content/browser/resource_context.h"
 #include "net/base/cookie_monster.h"
 
@@ -24,6 +23,7 @@
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class DesktopNotificationService;
+class DownloadIdFactory;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class HostZoomMap;
@@ -294,7 +294,7 @@
   mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   mutable scoped_refptr<quota::QuotaManager> quota_manager_;
   mutable scoped_refptr<HostZoomMap> host_zoom_map_;
-  mutable DownloadManager::GetNextIdThunkType next_download_id_thunk_;
+  mutable scoped_refptr<DownloadIdFactory> download_id_factory_;
   mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.