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

chrome/browser/download/download_service.h

Index: chrome/browser/download/download_service.h
===================================================================
--- chrome/browser/download/download_service.h	(revision 108294)
+++ chrome/browser/download/download_service.h	(working copy)
@@ -14,6 +14,7 @@
 class ChromeDownloadManagerDelegate;
 class DownloadManager;
 class Profile;
+class DownloadIdFactory;
 
 // Owning class for DownloadManager (content) and
 // ChromeDownloadManagerDelegate (chrome)
@@ -22,6 +23,8 @@
   explicit DownloadService(Profile* profile);
   virtual ~DownloadService();
 
+  DownloadIdFactory* GetDownloadIdFactory() const;
+
   // Get the download manager.  Creates the download manager if
   // it does not already exist.
   DownloadManager* GetDownloadManager();
@@ -40,6 +43,8 @@
   virtual void Shutdown() OVERRIDE;
 
  private:
+  scoped_refptr<DownloadIdFactory> id_factory_;
+
   bool download_manager_created_;
   Profile* profile_;