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

content/shell/shell_browser_context.cc

Index: content/shell/shell_browser_context.cc
===================================================================
--- content/shell/shell_browser_context.cc	(revision 108294)
+++ content/shell/shell_browser_context.cc	(working copy)
@@ -10,14 +10,15 @@
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/geolocation/geolocation_permission_context.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "content/browser/ssl/ssl_host_state.h"
-#include "content/browser/speech/speech_input_preferences.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_download_manager_delegate.h"
 #include "content/shell/shell_resource_context.h"
@@ -80,7 +81,8 @@
 
 ShellBrowserContext::ShellBrowserContext(
     ShellBrowserMainParts* shell_main_parts)
-    : shell_main_parts_(shell_main_parts) {
+    : download_id_factory_(new DownloadIdFactory(this)),
+      shell_main_parts_(shell_main_parts) {
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
@@ -123,6 +125,7 @@
 
     download_manager_delegate_ = new ShellDownloadManagerDelegate();
     download_manager_ = new DownloadManager(download_manager_delegate_,
+                                            download_id_factory_,
                                             download_status_updater_.get());
     download_manager_delegate_->SetDownloadManager(download_manager_.get());
     download_manager_->Init(this);
@@ -156,7 +159,7 @@
     resource_context_.reset(new ShellResourceContext(
         static_cast<ShellURLRequestContextGetter*>(GetRequestContext()),
         GetBlobStorageContext(),
-        GetDownloadManager()->GetNextIdThunk()));
+        download_id_factory_));
   }
   return *resource_context_.get();
 }