Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/renderer/service_worker/service_worker_script_context.cc

Index: content/renderer/service_worker/service_worker_script_context.cc
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index a3b296e9320878190fe6e8971f89bccd1cbb2e80..a0eaa1e87604c950a815bc3bfbb734b1538d1cd9 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -16,6 +16,7 @@
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/public/common/referrer.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
+#include "content/renderer/service_worker/webserviceworkercachestorage_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebCrossOriginServiceWorkerClient.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
@@ -97,8 +98,10 @@ ToWebServiceWorkerClientInfo(const ServiceWorkerClientInfo& client_info) {
 ServiceWorkerScriptContext::ServiceWorkerScriptContext(
     EmbeddedWorkerContextClient* embedded_context,
     blink::WebServiceWorkerContextProxy* proxy)
-    : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)),
-      embedded_context_(embedded_context),
+    : embedded_context_(embedded_context),
+      cache_storage_(new WebServiceWorkerCacheStorageImpl(
+          embedded_context->thread_safe_sender(),
+          embedded_context->origin())),
       proxy_(proxy) {
 }
 
@@ -136,11 +139,6 @@ void ServiceWorkerScriptContext::OnMessageReceived(
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
-  // TODO(gavinp): Would it be preferable to put an AddListener() method to
-  // EmbeddedWorkerContextClient?
-  if (!handled)
-    handled = cache_storage_dispatcher_->OnMessageReceived(message);
-
   DCHECK(handled);
 }