Fix history importing by delaying DownloadManager creation.

content/browser/download/save_package.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 12 matching lines @@
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/save_file.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/download/save_item.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #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"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h"
@@ skipping 214 matching lines @@
   wait_state_ = START_PROCESS;
 
   // Initialize the request context and resource dispatcher.
   content::BrowserContext* browser_context = tab_contents()->browser_context();
   if (!browser_context) {
     NOTREACHED();
     return false;
   }
 
   // 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.
   download_manager_->SavePageDownloadStarted(download_);
 
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
     // Get directory
     DCHECK(!saved_main_directory_path_.empty());
     GetAllSavableResourceLinksForCurrentPage();
@@ skipping 995 matching lines @@
     StopObservation();
 }
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->SavePageDownloadFinished(download_);
   StopObservation();
 }