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

content/browser/resource_context.cc

 // 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.
 
 #include "content/browser/resource_context.h"
 
 #include "base/logging.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/plugin_process_host.h"
 #include "webkit/database/database_tracker.h"
@@ skipping 135 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
   return media_observer_;
 }
 
 void ResourceContext::set_media_observer(MediaObserver* media_observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   media_observer_ = media_observer;
 }
 
-const DownloadManager::GetNextIdThunkType&
-ResourceContext::next_download_id_thunk() const {
+DownloadIdFactory* ResourceContext::download_id_factory() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
-  return next_download_id_thunk_;
+  return download_id_factory_;
 }
-void ResourceContext::set_next_download_id_thunk(
-    const DownloadManager::GetNextIdThunkType& thunk) {
+void ResourceContext::set_download_id_factory(
+    DownloadIdFactory* download_id_factory) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  next_download_id_thunk_ = thunk;
+  download_id_factory_ = download_id_factory;
 }
 
 media_stream::MediaStreamManager*
 ResourceContext::media_stream_manager() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
   return media_stream_manager_;
 }
 
 void ResourceContext::set_media_stream_manager(
     media_stream::MediaStreamManager* media_stream_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   media_stream_manager_ = media_stream_manager;
 }
 
 }  // namespace content