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

content/browser/download/download_create_info.h

Index: content/browser/download/download_create_info.h
===================================================================
--- content/browser/download/download_create_info.h	(revision 108294)
+++ content/browser/download/download_create_info.h	(working copy)
@@ -13,6 +13,7 @@
 #include "base/file_path.h"
 #include "base/time.h"
 #include "content/browser/download/download_file.h"
+#include "content/browser/download/download_id.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
@@ -27,7 +28,7 @@
                      int64 received_bytes,
                      int64 total_bytes,
                      int32 state,
-                     int32 download_id,
+                     const DownloadId& download_id,
                      bool has_user_gesture,
                      content::PageTransition transition_type);
   DownloadCreateInfo();
@@ -66,7 +67,7 @@
   int32 state;
 
   // The (per-session) ID of the download.
-  int32 download_id;
+  DownloadId download_id;
 
   // True if the download was initiated by user action.
   bool has_user_gesture;