Remove storage context accessors from ResourceContext.

content/browser/worker_host/worker_message_filter.cc

Index: content/browser/worker_host/worker_message_filter.cc
diff --git a/content/browser/worker_host/worker_message_filter.cc b/content/browser/worker_host/worker_message_filter.cc
index ecd719b29919722311d8fde4bd1ba916ab1f5217..443db65bdacf3a8c09389e21e6f0b56051908b7e 100644
--- a/content/browser/worker_host/worker_message_filter.cc
+++ b/content/browser/worker_host/worker_message_filter.cc
@@ -16,11 +16,22 @@ using content::WorkerServiceImpl;
 
 WorkerMessageFilter::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)
     : render_process_id_(render_process_id),
+      partition_id_(partition_id),
       resource_context_(resource_context),
+      appcache_service_(appcache_service),
+      filesystem_context_(filesystem_context),
+      database_tracker_(database_tracker),
+      indexed_db_context_(indexed_db_context),
       next_routing_id_(callback) {
+  // Note: This constructor is called on both IO or UI thread.
   DCHECK(resource_context);
 }
 
@@ -81,7 +92,9 @@ void WorkerMessageFilter::OnCreateWorker(
   *route_id = params.route_id != MSG_ROUTING_NONE ?
       params.route_id : next_routing_id_.Run();
   WorkerServiceImpl::GetInstance()->CreateWorker(
-      params, *route_id, this, resource_context_);
+      params, *route_id, this, partition_id_, resource_context_,
+      appcache_service_, filesystem_context_, database_tracker_,
+      indexed_db_context_);
 }
 
 void WorkerMessageFilter::OnLookupSharedWorker(
@@ -92,7 +105,9 @@ void WorkerMessageFilter::OnLookupSharedWorker(
   *route_id = next_routing_id_.Run();
 
   WorkerServiceImpl::GetInstance()->LookupSharedWorker(
-      params, *route_id, this, resource_context_, exists, url_error);
+      params, *route_id, this, partition_id_, resource_context_,
+      appcache_service_, filesystem_context_, database_tracker_,
+      indexed_db_context_, exists, url_error);
 }
 
 void WorkerMessageFilter::OnForwardToWorker(const IPC::Message& message) {