Make content::ResourceContext be a real interface like the rest of the Content API (i.e. don't ha...

content/browser/resource_context.h

Index: content/browser/resource_context.h
===================================================================
--- content/browser/resource_context.h	(revision 121250)
+++ content/browser/resource_context.h	(working copy)
@@ -39,74 +39,22 @@
 
 // ResourceContext contains the relevant context information required for
 // resource loading. It lives on the IO thread, although it is constructed on
-// the UI thread. ResourceContext doesn't own anything it points to, it just
-// holds pointers to relevant objects to resource loading.
+// the UI thread.
 class CONTENT_EXPORT ResourceContext {
  public:
-  virtual ~ResourceContext();
+   virtual ~ResourceContext();
 
-  // The user data allows the clients to associate data with this request.
-  // Multiple user data values can be stored under different keys.
-  void* GetUserData(const void* key) const;
-  void SetUserData(const void* key, void* data);
-
-  net::HostResolver* host_resolver() const;
-  void set_host_resolver(net::HostResolver* host_resolver);
-
-  net::URLRequestContext* request_context() const;
-  void set_request_context(net::URLRequestContext* request_context);
-
-  ChromeAppCacheService* appcache_service() const;
-  void set_appcache_service(ChromeAppCacheService* service);
-
-  webkit_database::DatabaseTracker* database_tracker() const;
-  void set_database_tracker(webkit_database::DatabaseTracker* tracker);
-
-  fileapi::FileSystemContext* file_system_context() const;
-  void set_file_system_context(fileapi::FileSystemContext* context);
-
-  ChromeBlobStorageContext* blob_storage_context() const;
-  void set_blob_storage_context(ChromeBlobStorageContext* context);
-
-  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);
-
-  media_stream::MediaStreamManager* media_stream_manager() const;
-  void set_media_stream_manager(
-      media_stream::MediaStreamManager* media_stream_manager);
-
-  AudioManager* audio_manager() const;
-  void set_audio_manager(AudioManager* audio_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_;
-  media_stream::MediaStreamManager* media_stream_manager_;
-  AudioManager* audio_manager_;
-
-  // Externally-defined data accessible by key.
-  typedef std::map<const void*, void*> UserDataMap;
-  UserDataMap user_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ResourceContext);
+  virtual net::HostResolver* GetHostResolver() = 0;
+  virtual net::URLRequestContext* GetRequestContext() = 0;
+  virtual ChromeAppCacheService* GetAppCacheService() = 0;
+  virtual webkit_database::DatabaseTracker* GetDatabaseTracker() = 0;
+  virtual fileapi::FileSystemContext* GetFileSystemContext() = 0;
+  virtual ChromeBlobStorageContext* GetBlobStorageContext() = 0;
+  virtual quota::QuotaManager* GetQuotaManager() = 0;
+  virtual HostZoomMap* GetHostZoomMap() = 0;
+  virtual MediaObserver* GetMediaObserver() = 0;
+  virtual media_stream::MediaStreamManager* GetMediaStreamManager() = 0;
+  virtual AudioManager* GetAudioManager() = 0;
 };
 
 }  // namespace content