Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u…

chrome/browser/profiles/profile_io_data.h

 // Copyright (c) 2012 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 CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/cookie_monster.h"
 
 class AudioManager;
-class ChromeAppCacheService;
-class ChromeBlobStorageContext;
 class CookieSettings;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
 class TransportSecurityPersister;
 class WebKitContext;
 
-namespace fileapi {
-class FileSystemContext;
-}  // namespace fileapi
-
 namespace media_stream {
 class MediaStreamManager;
 }  // namespace media_stream
 
 namespace net {
 class CookieStore;
 class FraudulentCertificateReporter;
 class HttpTransactionFactory;
 class OriginBoundCertService;
 class ProxyConfigService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityState;
 }  // namespace net
 
 namespace policy {
 class URLBlacklistManager;
 }  // namespace policy
 
-namespace quota {
-class QuotaManager;
-};  // namespace quota
-
-namespace webkit_database {
-class DatabaseTracker;
-}  // webkit_database
-
 // Conceptually speaking, the ProfileIOData represents data that lives on the IO
 // thread that is owned by a Profile, such as, but not limited to, network
 // objects like CookieMonster, HttpTransactionFactory, etc.  Profile owns
 // ProfileIOData, but will make sure to delete it on the IO thread (except
 // possibly in unit tests where there is no IO thread).
 class ProfileIOData {
  public:
   virtual ~ProfileIOData();
 
   static ProfileIOData* FromResourceContext(content::ResourceContext* rc);
@@ skipping 74 matching lines @@
     std::string accept_language;
     std::string accept_charset;
     std::string referrer_charset;
     IOThread* io_thread;
     AudioManager* audio_manager;
     scoped_refptr<HostContentSettingsMap> host_content_settings_map;
     scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<content::HostZoomMap> host_zoom_map;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
-    scoped_refptr<webkit_database::DatabaseTracker> database_tracker;
-    scoped_refptr<ChromeAppCacheService> appcache_service;
-    scoped_refptr<ChromeBlobStorageContext> blob_storage_context;
-    scoped_refptr<fileapi::FileSystemContext> file_system_context;
     scoped_refptr<WebKitContext> webkit_context;
-    scoped_refptr<quota::QuotaManager> quota_manager;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
     DesktopNotificationService* notification_service;
     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
     // We need to initialize the ProxyConfigService from the UI thread
     // because on linux it relies on initializing things through gconf,
     // and needs to be on the main thread.
     scoped_ptr<net::ProxyConfigService> proxy_config_service;
     // The profile this struct was populated from. It's passed as a void* to
     // ensure it's not accidently used on the IO thread. Before using it on the
     // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
@@ skipping 54 matching lines @@
    public:
     explicit ResourceContext(ProfileIOData* io_data);
     virtual ~ResourceContext();
 
    private:
     friend class ProfileIOData;
 
     // ResourceContext implementation:
     virtual net::HostResolver* GetHostResolver() OVERRIDE;
     virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
-    virtual ChromeAppCacheService* GetAppCacheService() OVERRIDE;
-    virtual webkit_database::DatabaseTracker* GetDatabaseTracker() OVERRIDE;
-    virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE;
-    virtual WebKitContext* GetWebKitContext() OVERRIDE;
-    virtual ChromeBlobStorageContext* GetBlobStorageContext() OVERRIDE;
-    virtual quota::QuotaManager* GetQuotaManager() OVERRIDE;
     virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE;
     virtual MediaObserver* GetMediaObserver() OVERRIDE;
     virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
     virtual AudioManager* GetAudioManager() OVERRIDE;
 
     void EnsureInitialized();
 
     ProfileIOData* const io_data_;
 
     net::HostResolver* host_resolver_;
     net::URLRequestContext* request_context_;
-    ChromeAppCacheService* appcache_service_;
-    webkit_database::DatabaseTracker* database_tracker_;
-    fileapi::FileSystemContext* file_system_context_;
-    WebKitContext* webkit_context_;
-    ChromeBlobStorageContext* blob_storage_context_;
-    quota::QuotaManager* quota_manager_;
     content::HostZoomMap* host_zoom_map_;
     MediaObserver* media_observer_;
     media_stream::MediaStreamManager* media_stream_manager_;
     AudioManager* audio_manager_;
   };
 
   typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
       AppRequestContextMap;
 
   // --------------------------------------------
@@ skipping 40 matching lines @@
       chrome_url_data_manager_backend_;
   mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
   mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
 
   // Pointed to by ResourceContext.
-  mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
-  mutable scoped_refptr<ChromeAppCacheService> appcache_service_;
-  mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
-  mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
-  mutable scoped_refptr<WebKitContext> webkit_context_;
-  mutable scoped_refptr<quota::QuotaManager> quota_manager_;
   mutable scoped_refptr<content::HostZoomMap> host_zoom_map_;
   mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   mutable scoped_refptr<CookieSettings> cookie_settings_;
   mutable DesktopNotificationService* notification_service_;
 
   mutable ResourceContext resource_context_;
 
   mutable scoped_ptr<TransportSecurityPersister>
       transport_security_persister_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_