Fix history importing by delaying DownloadManager creation.

content/browser/download/save_package.cc

Index: content/browser/download/save_package.cc
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index be2c0518280d2102bdbe3e20d6be72795b09b814..2ee71da85b2178df7ec80f4132b3a544f47c55a9 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -30,6 +30,7 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/resource_context.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
@@ -264,11 +265,12 @@ bool SavePackage::Init() {
   }
 
   // Create the download item, and add ourself as an observer.
-  download_ = new DownloadItem(download_manager_,
-                               saved_main_file_path_,
-                               page_url_,
-                               browser_context->IsOffTheRecord(),
-                               download_manager_->GetNextId());
+  download_ = new DownloadItem(
+      download_manager_,
+      saved_main_file_path_,
+      page_url_,
+      browser_context->IsOffTheRecord(),
+      browser_context->GetDownloadManager()->GetNextId());

[Randy Smith (Not in Mondays), 2011/10/28 13:35:44]

nit: Why the shift to browser_context?

[benjhayden, 2011/10/28 14:37:55]

Done.

   download_->AddObserver(this);
 
   // Transfer ownership to the download manager.