Remove storage context accessors from ResourceContext.

content/browser/worker_host/worker_message_filter.h

Index: content/browser/worker_host/worker_message_filter.h
diff --git a/content/browser/worker_host/worker_message_filter.h b/content/browser/worker_host/worker_message_filter.h
index 34b62644368fc210189f217e93dd04a723ac550e..bba055a35ccb3c175dc2cef4d2aee3829a072c4b 100644
--- a/content/browser/worker_host/worker_message_filter.h
+++ b/content/browser/worker_host/worker_message_filter.h
@@ -5,9 +5,13 @@
 #ifndef CONTENT_BROWSER_WORKER_HOST_WORKER_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_WORKER_HOST_WORKER_MESSAGE_FILTER_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "content/public/browser/browser_message_filter.h"
 
+class ChromeAppCacheService;
+class IndexedDBContextImpl;
 class ResourceDispatcherHost;
 struct ViewHostMsg_CreateWorker_Params;
 
@@ -15,6 +19,13 @@ namespace content {
 class ResourceContext;
 }  // namespace content
 
+namespace fileapi {
+class FileSystemContext;
+}  // namespace fileapi
+
+namespace webkit_database {
+class DatabaseTracker;
+}  // namespace webkit_database
 
 class WorkerMessageFilter : public content::BrowserMessageFilter {
  public:
@@ -24,7 +35,12 @@ class WorkerMessageFilter : public content::BrowserMessageFilter {
   // OnChannelClosing.
   WorkerMessageFilter(
       int render_process_id,
+      const std::string& partition_id,
       content::ResourceContext* resource_context,
+      ChromeAppCacheService* appcache_service,
+      fileapi::FileSystemContext* filesystem_context,
+      webkit_database::DatabaseTracker* database_tracker,
+      IndexedDBContextImpl* indexed_db_context,
       const NextRoutingIDCallback& callback);
 
   // content::BrowserMessageFilter implementation.
@@ -50,7 +66,12 @@ class WorkerMessageFilter : public content::BrowserMessageFilter {
   void OnCreateMessagePort(int* route_id, int* message_port_id);
 
   int render_process_id_;
+  std::string partition_id_;
   content::ResourceContext* const resource_context_;
+  ChromeAppCacheService* const appcache_service_;
+  fileapi::FileSystemContext* const filesystem_context_;
+  webkit_database::DatabaseTracker* const database_tracker_;
+  IndexedDBContextImpl* const indexed_db_context_;
 
   // This is guaranteed to be valid until OnChannelClosing is closed, and it's
   // not used after.