Cache Storage: Remove unused Service/Embedder Worker plumbing

content/renderer/service_worker/service_worker_script_context.h

Index: content/renderer/service_worker/service_worker_script_context.h
diff --git a/content/renderer/service_worker/service_worker_script_context.h b/content/renderer/service_worker/service_worker_script_context.h
index 07b58ca050776d8beb1cdda57360a23c409af18a..2def78fe69c174cad90aa71b2ddd861c04554c60 100644
--- a/content/renderer/service_worker/service_worker_script_context.h
+++ b/content/renderer/service_worker/service_worker_script_context.h
@@ -16,11 +16,8 @@
 #include "base/time/time.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/service_worker/service_worker_types.h"
-#include "content/renderer/service_worker/service_worker_cache_storage_dispatcher.h"
-#include "content/renderer/service_worker/webserviceworkercachestorage_impl.h"
 #include "third_party/WebKit/public/platform/WebGeofencingEventType.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
-#include "third_party/WebKit/public/platform/WebServiceWorkerCacheStorage.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientsClaimCallbacks.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientsInfo.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
@@ -102,11 +99,6 @@ class ServiceWorkerScriptContext {
   // in the browser process.
   int GetRoutingID() const;
 
-  // TODO(jsbell): Remove when CacheStorage creation is moved. crbug.com/439389
-  blink::WebServiceWorkerCacheStorage* cache_storage() const {
-    return cache_storage_.get();
-  }
-
  private:
   typedef IDMap<blink::WebServiceWorkerClientsCallbacks, IDMapOwnPointer>
       ClientsCallbacksMap;
@@ -158,8 +150,6 @@ class ServiceWorkerScriptContext {
   // Not owned; embedded_context_ owns this.
   EmbeddedWorkerContextClient* embedded_context_;
 
-  scoped_ptr<WebServiceWorkerCacheStorageImpl> cache_storage_;
-
   // Not owned; this object is destroyed when proxy_ becomes invalid.
   blink::WebServiceWorkerContextProxy* proxy_;