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

content/browser/download/download_manager.h

Index: content/browser/download/download_manager.h
===================================================================
--- content/browser/download/download_manager.h	(revision 108294)
+++ content/browser/download/download_manager.h	(working copy)
@@ -45,6 +45,7 @@
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/download/download_id.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_status_updater_delegate.h"
@@ -53,6 +54,7 @@
 #include "net/base/net_errors.h"
 
 class DownloadFileManager;
+class DownloadIdFactory;
 class DownloadManagerDelegate;
 class DownloadStatusUpdater;
 class GURL;
@@ -72,6 +74,7 @@
       public DownloadStatusUpdaterDelegate {
  public:
   DownloadManager(DownloadManagerDelegate* delegate,
+                  DownloadIdFactory* id_factory,
                   DownloadStatusUpdater* status_updater);
 
   // Shutdown the download manager. Must be called before destruction.
@@ -111,24 +114,8 @@
   // everything.
   void SearchDownloads(const string16& query, DownloadVector* result);
 
-  // Returns the next download id in a DownloadId and increments the counter.
-  // May be called on any thread. The incremented counter is not persisted, but
-  // the base counter for this accessor is initialized from the largest id
-  // actually saved to the download history database.
   DownloadId GetNextId();
 
-  // Instead of passing a DownloadManager* between threads and hoping users only
-  // call GetNextId(), you can pass this thunk around instead. Pass the thunk
-  // around by const ref and store it by copy per the base::Callback interface.
-  // The thunk may be copied, including between threads.  If you change
-  // GetNextIdThunkType from base::Callback, then you should think about how
-  // you're changing the ref-count of DownloadManager. Use it like:
-  //   const DownloadManager::GetNextIdThunkType& next_id_thunk =
-  //       download_manager->GetNextIdThunk();
-  //   id = next_id_thunk.Run();
-  typedef base::Callback<DownloadId(void)> GetNextIdThunkType;
-  GetNextIdThunkType GetNextIdThunk();
-
   // Returns true if initialized properly.
   bool Init(content::BrowserContext* browser_context);
 
@@ -219,11 +206,6 @@
   // Remove a download observer from ourself.
   void RemoveObserver(Observer* observer);
 
-  // Called by the embedder after creating the download manager to inform it of
-  // the next available download id.
-  // TODO(benjhayden): Separate this functionality out into a separate object.
-  void OnPersistentStoreGetNextId(int next_id);
-
   // Called by the embedder, after creating the download manager, to let it know
   // about downloads from previous runs of the browser.
   void OnPersistentStoreQueryComplete(
@@ -417,9 +399,6 @@
   // The current active browser context.
   content::BrowserContext* browser_context_;
 
-  base::Lock next_id_lock_;
-  int next_id_;
-
   // Non-owning pointer for handling file writing on the download_thread_.
   DownloadFileManager* file_manager_;
 
@@ -433,6 +412,8 @@
   // Allows an embedder to control behavior. Guaranteed to outlive this object.
   DownloadManagerDelegate* delegate_;
 
+  DownloadIdFactory* id_factory_;
+
   // TODO(rdsmith): Remove when http://crbug.com/85408 is fixed.
   // For debugging only.
   int64 largest_db_handle_in_history_;