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

content/browser/resource_context.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_RESOURCE_CONTEXT_H_
 #define CONTENT_BROWSER_RESOURCE_CONTEXT_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "content/browser/download/download_manager.h"
 
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
+class DownloadIdFactory;
 class ExtensionInfoMap;
 class HostZoomMap;
 class MediaObserver;
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 namespace media_stream {
 class MediaStreamManager;
 }  // namespace media_stream
 namespace net {
@@ skipping 42 matching lines @@
 
   quota::QuotaManager* quota_manager() const;
   void set_quota_manager(quota::QuotaManager* quota_manager);
 
   HostZoomMap* host_zoom_map() const;
   void set_host_zoom_map(HostZoomMap* host_zoom_map);
 
   MediaObserver* media_observer() const;
   void set_media_observer(MediaObserver* media_observer);
 
-  // TODO(benjhayden): Promote GetNextIdThunkType to a separate object.
-  const DownloadManager::GetNextIdThunkType& next_download_id_thunk() const;
-  void set_next_download_id_thunk(
-      const DownloadManager::GetNextIdThunkType& thunk);
+  DownloadIdFactory* download_id_factory() const;
+  void set_download_id_factory(DownloadIdFactory* download_id_factory);
 
   media_stream::MediaStreamManager* media_stream_manager() const;
   void set_media_stream_manager(
       media_stream::MediaStreamManager* media_stream_manager);
 
  protected:
   ResourceContext();
 
  private:
   virtual void EnsureInitialized() const = 0;
 
   net::HostResolver* host_resolver_;
   net::URLRequestContext* request_context_;
   ChromeAppCacheService* appcache_service_;
   webkit_database::DatabaseTracker* database_tracker_;
   fileapi::FileSystemContext* file_system_context_;
   ChromeBlobStorageContext* blob_storage_context_;
   quota::QuotaManager* quota_manager_;
   HostZoomMap* host_zoom_map_;
   MediaObserver* media_observer_;
-  DownloadManager::GetNextIdThunkType next_download_id_thunk_;
+  DownloadIdFactory* download_id_factory_;
   media_stream::MediaStreamManager* media_stream_manager_;
 
   // Externally-defined data accessible by key.
   typedef std::map<const void*, void*> UserDataMap;
   UserDataMap user_data_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RESOURCE_CONTEXT_H_