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

content/shell/shell_browser_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/shell/shell_browser_context.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/geolocation/geolocation_permission_context.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "content/browser/ssl/ssl_host_state.h"
-#include "content/browser/speech/speech_input_preferences.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_download_manager_delegate.h"
 #include "content/shell/shell_resource_context.h"
 #include "content/shell/shell_url_request_context_getter.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #endif
@@ skipping 42 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellSpeechInputPreferences);
 };
 
 }  // namespace
 
 namespace content {
 
 ShellBrowserContext::ShellBrowserContext(
     ShellBrowserMainParts* shell_main_parts)
-    : shell_main_parts_(shell_main_parts) {
+    : download_id_factory_(new DownloadIdFactory(this)),
+      shell_main_parts_(shell_main_parts) {
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
   if (resource_context_.get()) {
     BrowserThread::DeleteSoon(
       BrowserThread::IO, FROM_HERE, resource_context_.release());
   }
 }
 
 FilePath ShellBrowserContext::GetPath() {
@@ skipping 22 matching lines @@
     ssl_host_state_.reset(new SSLHostState());
   return ssl_host_state_.get();
 }
 
 DownloadManager* ShellBrowserContext::GetDownloadManager()  {
   if (!download_manager_.get()) {
     download_status_updater_.reset(new DownloadStatusUpdater());
 
     download_manager_delegate_ = new ShellDownloadManagerDelegate();
     download_manager_ = new DownloadManager(download_manager_delegate_,
+                                            download_id_factory_,
                                             download_status_updater_.get());
     download_manager_delegate_->SetDownloadManager(download_manager_.get());
     download_manager_->Init(this);
   }
   return download_manager_.get();
 }
 
 net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext()  {
   if (!url_request_getter_) {
     url_request_getter_ = new ShellURLRequestContextGetter(
@@ skipping 13 matching lines @@
 net::URLRequestContextGetter*
     ShellBrowserContext::GetRequestContextForMedia()  {
   return GetRequestContext();
 }
 
 const ResourceContext& ShellBrowserContext::GetResourceContext()  {
   if (!resource_context_.get()) {
     resource_context_.reset(new ShellResourceContext(
         static_cast<ShellURLRequestContextGetter*>(GetRequestContext()),
         GetBlobStorageContext(),
-        GetDownloadManager()->GetNextIdThunk()));
+        download_id_factory_));
   }
   return *resource_context_.get();
 }
 
 HostZoomMap* ShellBrowserContext::GetHostZoomMap()  {
   if (!host_zoom_map_)
     host_zoom_map_ = new HostZoomMap();
   return host_zoom_map_.get();
 }
 
@@ skipping 78 matching lines @@
     NewRunnableMethod(
         appcache_service_.get(),
         &ChromeAppCacheService::InitializeOnIOThread,
         IsOffTheRecord()
             ? FilePath() : GetPath().Append(FILE_PATH_LITERAL("AppCache")),
         &GetResourceContext(),
         special_storage_policy));
 }
 
 }  // namespace content