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

content/browser/download/download_file.h

Index: content/browser/download/download_file.h
===================================================================
--- content/browser/download/download_file.h	(revision 108294)
+++ content/browser/download/download_file.h	(working copy)
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/download/base_file.h"
+#include "content/browser/download/download_id.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_types.h"
 #include "content/common/content_export.h"
@@ -32,7 +33,8 @@
   // Cancels the download request associated with this file.
   void CancelDownloadRequest();
 
-  int id() const { return id_; }
+  int id() const { return id_.local(); }
+  const DownloadId& global_id() const { return id_; }
   DownloadManager* GetDownloadManager();
 
   virtual std::string DebugString() const;
@@ -60,7 +62,7 @@
  private:
   // The unique identifier for this download, assigned at creation by
   // the DownloadFileManager for its internal record keeping.
-  int id_;
+  DownloadId id_;
 
   // The handle to the request information.  Used for operations outside the
   // download system, specifically canceling a download.