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

content/shell/shell_browser_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_SHELL_SHELL_BROWSER_CONTEXT_H_
 #define CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_context.h"
 
+class DownloadIdFactory;
 class DownloadManager;
 class DownloadManagerDelegate;
 class DownloadStatusUpdater;
 class GeolocationPermissionContext;
 class HostZoomMap;
 class SSLHostState;
 
 namespace content {
 
 class ResourceContext;
@@ skipping 28 matching lines @@
   virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE;
 
  private:
   void CreateQuotaManagerAndClients();
 
   FilePath path_;
   scoped_ptr<ResourceContext> resource_context_;
   scoped_ptr<SSLHostState> ssl_host_state_;
   scoped_ptr<DownloadStatusUpdater> download_status_updater_;
   scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_;
+  scoped_refptr<DownloadIdFactory> download_id_factory_;
   scoped_refptr<DownloadManager> download_manager_;
   scoped_refptr<net::URLRequestContextGetter> url_request_getter_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
   scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
   scoped_refptr<SpeechInputPreferences> speech_input_preferences_;
   scoped_refptr<WebKitContext> webkit_context_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   scoped_refptr<quota::QuotaManager> quota_manager_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   ShellBrowserMainParts* shell_main_parts_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_