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

content/browser/download/download_create_info.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_CREATE_INFO_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_CREATE_INFO_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #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"
 #include "googleurl/src/gurl.h"
 
 // Used for informing the download manager of a new download, since we don't
 // want to pass |DownloadItem|s between threads.
 struct CONTENT_EXPORT DownloadCreateInfo {
   DownloadCreateInfo(const FilePath& path,
                      const GURL& url,
                      const base::Time& start_time,
                      int64 received_bytes,
                      int64 total_bytes,
                      int32 state,
-                     int32 download_id,
+                     const DownloadId& download_id,
                      bool has_user_gesture,
                      content::PageTransition transition_type);
   DownloadCreateInfo();
   ~DownloadCreateInfo();
 
   std::string DebugString() const;
 
   // The URL from which we are downloading. This is the final URL after any
   // redirection by the server for |url_chain|.
   const GURL& url() const;
@@ skipping 18 matching lines @@
   // The number of bytes that have been received.
   int64 received_bytes;
 
   // The total download size.
   int64 total_bytes;
 
   // The current state of the download.
   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;
 
   content::PageTransition transition_type;
 
   // The handle to the download request information.  Used for operations
   // outside the download system.
   DownloadRequestHandle request_handle;
 
@@ skipping 22 matching lines @@
 
   // The charset of the referring page where the download request comes from.
   // It's used to construct a suggested filename.
   std::string referrer_charset;
 
   // The download file save info.
   DownloadSaveInfo save_info;
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_CREATE_INFO_H_