Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't used by chrome, so they can be hidden from chrome. The rest were accessed by chrome, but we don't need every embedder to store this data on their ResourceContext implementation. Instead have content associate the data itself to simplify the work for embedders.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9425026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122790 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 42 deletions

diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index b118413..f98c43f 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -158,8 +158,7 @@ net::URLRequestContextGetter*
 ResourceContext* ShellBrowserContext::GetResourceContext()  {
   if (!resource_context_.get()) {
     resource_context_.reset(new ShellResourceContext(
-        static_cast<ShellURLRequestContextGetter*>(GetRequestContext()),
-        BrowserContext::GetBlobStorageContext(this)));
+        static_cast<ShellURLRequestContextGetter*>(GetRequestContext())));
   }
   return resource_context_.get();
 }
diff --git a/content/shell/shell_resource_context.cc b/content/shell/shell_resource_context.cc
index e58c397..d8c3f29 100644
--- a/content/shell/shell_resource_context.cc
+++ b/content/shell/shell_resource_context.cc
@@ -3,17 +3,13 @@
 // found in the LICENSE file.
 
 #include "content/shell/shell_resource_context.h"
-
-#include "content/browser/chrome_blob_storage_context.h"
 #include "content/shell/shell_url_request_context_getter.h"
 
 namespace content {
 
 ShellResourceContext::ShellResourceContext(
-    ShellURLRequestContextGetter* getter,
-    ChromeBlobStorageContext* blob_storage_context)
-    : getter_(getter),
-      blob_storage_context_(blob_storage_context) {
+    ShellURLRequestContextGetter* getter)
+    : getter_(getter) {
 }
 
 ShellResourceContext::~ShellResourceContext() {
@@ -27,26 +23,6 @@ net::URLRequestContext* ShellResourceContext::GetRequestContext() {
   return getter_->GetURLRequestContext();
 }
 
-ChromeAppCacheService* ShellResourceContext::GetAppCacheService() {
-  return NULL;
-}
-
-webkit_database::DatabaseTracker* ShellResourceContext::GetDatabaseTracker() {
-  return NULL;
-}
-
-fileapi::FileSystemContext* ShellResourceContext::GetFileSystemContext() {
-  return NULL;
-}
-
-ChromeBlobStorageContext* ShellResourceContext::GetBlobStorageContext() {
-  return blob_storage_context_;
-}
-
-quota::QuotaManager* ShellResourceContext::GetQuotaManager() {
-  return NULL;
-}
-
 HostZoomMap* ShellResourceContext::GetHostZoomMap() {
   return NULL;
 }
@@ -64,8 +40,4 @@ AudioManager* ShellResourceContext::GetAudioManager() {
   return NULL;
 }
 
-WebKitContext* ShellResourceContext::GetWebKitContext() {
-  return NULL;
-}
-
 }  // namespace content
diff --git a/content/shell/shell_resource_context.h b/content/shell/shell_resource_context.h
index ff2db50..91e76bf 100644
--- a/content/shell/shell_resource_context.h
+++ b/content/shell/shell_resource_context.h
@@ -18,28 +18,19 @@ class ShellURLRequestContextGetter;
 
 class ShellResourceContext : public content::ResourceContext {
  public:
-  ShellResourceContext(
-      ShellURLRequestContextGetter* getter,
-      ChromeBlobStorageContext* blob_storage_context);
+  explicit ShellResourceContext(ShellURLRequestContextGetter* getter);
   virtual ~ShellResourceContext();
 
  private:
   // 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 ChromeBlobStorageContext* GetBlobStorageContext() OVERRIDE;
-  virtual quota::QuotaManager* GetQuotaManager() OVERRIDE;
   virtual HostZoomMap* GetHostZoomMap() OVERRIDE;
   virtual MediaObserver* GetMediaObserver() OVERRIDE;
   virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
   virtual AudioManager* GetAudioManager() OVERRIDE;
-  virtual WebKitContext* GetWebKitContext() OVERRIDE;
 
   scoped_refptr<ShellURLRequestContextGetter> getter_;
-  scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellResourceContext);
 };