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

content/browser/download/download_create_info.cc

Index: content/browser/download/download_create_info.cc
===================================================================
--- content/browser/download/download_create_info.cc	(revision 108294)
+++ content/browser/download/download_create_info.cc	(working copy)
@@ -15,7 +15,7 @@
                                        int64 received_bytes,
                                        int64 total_bytes,
                                        int32 state,
-                                       int32 download_id,
+                                       const DownloadId& download_id,
                                        bool has_user_gesture,
                                        content::PageTransition transition_type)
     : path(path),
@@ -37,7 +37,7 @@
       received_bytes(0),
       total_bytes(0),
       state(-1),
-      download_id(-1),
+      download_id(DownloadId::Invalid()),
       has_user_gesture(false),
       transition_type(content::PAGE_TRANSITION_LINK),
       db_handle(0),
@@ -49,7 +49,7 @@
 
 std::string DownloadCreateInfo::DebugString() const {
   return base::StringPrintf("{"
-                            " download_id = %d"
+                            " download_id = %s"
                             " url = \"%s\""
                             " path = \"%" PRFilePath "\""
                             " received_bytes = %" PRId64
@@ -57,7 +57,7 @@
                             " request_handle = %s"
                             " prompt_user_for_save_location = %c"
                             " }",
-                            download_id,
+                            download_id.DebugString().c_str(),
                             url().spec().c_str(),
                             path.value().c_str(),
                             received_bytes,