Fix history importing by delaying DownloadManager creation.

content/browser/download/download_item.cc

Index: content/browser/download/download_item.cc
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index 84387b667353a3727d369273445e656fed360f2b..8c767e6bbff0498e4c793618fc5cc3ddd0b403b9 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -120,8 +120,9 @@ const int DownloadItem::kUninitializedHandle = 0;
 
 // Constructor for reading from the history service.
 DownloadItem::DownloadItem(DownloadManager* download_manager,
-                           const DownloadPersistentStoreInfo& info)
-    : download_id_(-1),
+                           const DownloadPersistentStoreInfo& info,
+                           const DownloadId& download_id)
+    : download_id_(download_id),
       full_path_(info.path),
       url_chain_(1, info.url),
       referrer_url_(info.referrer_url),
@@ -198,7 +199,7 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
                            const GURL& url,
                            bool is_otr,
                            DownloadId download_id)
-    : download_id_(download_id.local()),
+    : download_id_(download_id),
       full_path_(path),
       url_chain_(1, url),
       referrer_url_(GURL()),
@@ -232,10 +233,6 @@ DownloadItem::~DownloadItem() {
   download_manager_->AssertQueueStateConsistent(this);
 }
 
-DownloadId DownloadItem::global_id() const {
-  return DownloadId(download_manager_, id());
-}
-
 void DownloadItem::AddObserver(Observer* observer) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -774,7 +771,7 @@ std::string DownloadItem::DebugString(bool verbose) const {
   std::string description =
       base::StringPrintf("{ id = %d"
                          " state = %s",
-                         download_id_,
+                         download_id_.local(),
                          DebugDownloadStateString(state()));
 
   // Construct a string of the URL chain.