Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/renderer/service_worker/service_worker_script_context.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_
 #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #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"
 #include "third_party/WebKit/public/platform/WebServiceWorkerEventResult.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerSkipWaitingCallbacks.h"
 
 namespace blink {
 struct WebCircularGeofencingRegion;
 struct WebCrossOriginServiceWorkerClient;
 struct WebServiceWorkerClientQueryOptions;
@@ skipping 61 matching lines @@
   void SkipWaiting(blink::WebServiceWorkerSkipWaitingCallbacks* callbacks);
   void ClaimClients(blink::WebServiceWorkerClientsClaimCallbacks* callbacks);
 
   // Send a message to the browser. Takes ownership of |message|.
   void Send(IPC::Message* message);
 
   // Get routing_id for sending message to the ServiceWorkerVersion
   // in the browser process.
   int GetRoutingID() const;
 
-  blink::WebServiceWorkerCacheStorage* cache_storage() {
-    return cache_storage_dispatcher_.get();
+  // 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;
   typedef IDMap<blink::WebServiceWorkerClientsClaimCallbacks, IDMapOwnPointer>
       ClaimClientsCallbacksMap;
   typedef IDMap<blink::WebServiceWorkerClientCallbacks, IDMapOwnPointer>
       ClientCallbacksMap;
   typedef IDMap<blink::WebServiceWorkerSkipWaitingCallbacks, IDMapOwnPointer>
@@ skipping 30 matching lines @@
   void OnOpenWindowError(int request_id, const std::string& message);
   void OnFocusClientResponse(int request_id,
                              const ServiceWorkerClientInfo& client);
   void OnDidSkipWaiting(int request_id);
   void OnDidClaimClients(int request_id);
   void OnClaimClientsError(int request_id,
                            blink::WebServiceWorkerError::ErrorType error_type,
                            const base::string16& message);
   void OnPing();
 
-  scoped_ptr<ServiceWorkerCacheStorageDispatcher> cache_storage_dispatcher_;
-
   // 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_;
 
   // Used for incoming messages from the browser for which an outgoing response
   // back to the browser is expected, the id must be sent back with the
   // response.
   int current_request_id_;
 
   // Pending callbacks for GetClientDocuments().
   ClientsCallbacksMap pending_clients_callbacks_;
@@ skipping 13 matching lines @@
   std::map<int, base::TimeTicks> install_start_timings_;
   std::map<int, base::TimeTicks> notification_click_start_timings_;
   std::map<int, base::TimeTicks> push_start_timings_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerScriptContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_