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

content/browser/download/download_item.h

Index: content/browser/download/download_item.h
===================================================================
--- content/browser/download/download_item.h	(revision 108294)
+++ content/browser/download/download_item.h	(working copy)
@@ -25,6 +25,7 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "content/browser/download/download_id.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_state_info.h"
 #include "content/browser/download/interrupt_reasons.h"
@@ -276,8 +277,8 @@
     total_bytes_ = total_bytes;
   }
   int64 received_bytes() const { return received_bytes_; }
-  int32 id() const { return download_id_; }
-  DownloadId global_id() const;
+  int32 id() const { return download_id_.local(); }
+  DownloadId global_id() const { return download_id_; }
   base::Time start_time() const { return start_time_; }
   base::Time end_time() const { return end_time_; }
   void set_db_handle(int64 handle) { db_handle_ = handle; }
@@ -378,7 +379,7 @@
   DownloadRequestHandle request_handle_;
 
   // Download ID assigned by DownloadResourceHandler.
-  int32 download_id_;
+  DownloadId download_id_;
 
   // Full path to the downloaded or downloading file.
   FilePath full_path_;