Cache Storage: Move files to content/*/cache_storage, rename classes

content/renderer/service_worker/service_worker_cache_storage_dispatcher.h

Index: content/renderer/service_worker/service_worker_cache_storage_dispatcher.h
diff --git a/content/renderer/service_worker/service_worker_cache_storage_dispatcher.h b/content/renderer/service_worker/service_worker_cache_storage_dispatcher.h
deleted file mode 100644
index c298e01d5c8a7fed493a6d0dae387ebf9c761894..0000000000000000000000000000000000000000
--- a/content/renderer/service_worker/service_worker_cache_storage_dispatcher.h
+++ /dev/null
@@ -1,224 +0,0 @@
-// 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_CACHE_STORAGE_DISPATCHER_H_
-#define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_DISPATCHER_H_
-
-#include <vector>
-
-#include "base/id_map.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
-#include "base/time/time.h"
-#include "content/child/worker_task_runner.h"
-#include "content/public/renderer/render_process_observer.h"
-#include "third_party/WebKit/public/platform/WebServiceWorkerCache.h"
-#include "third_party/WebKit/public/platform/WebServiceWorkerCacheError.h"
-#include "third_party/WebKit/public/platform/WebServiceWorkerCacheStorage.h"
-
-namespace content {
-
-class ServiceWorkerScriptContext;
-class ThreadSafeSender;
-struct ServiceWorkerFetchRequest;
-struct ServiceWorkerResponse;
-
-// Handle the Cache Storage messaging for this context thread. The
-// main thread and each worker thread have their own instances.
-class ServiceWorkerCacheStorageDispatcher : public WorkerTaskRunner::Observer {
- public:
-  explicit ServiceWorkerCacheStorageDispatcher(
-      ThreadSafeSender* thread_safe_sender);
-  ~ServiceWorkerCacheStorageDispatcher() override;
-
-  // |thread_safe_sender| needs to be passed in because if the call leads to
-  // construction it will be needed.
-  static ServiceWorkerCacheStorageDispatcher* ThreadSpecificInstance(
-      ThreadSafeSender* thread_safe_sender);
-
-  // WorkerTaskRunner::Observer implementation.
-  void OnWorkerRunLoopStopped() override;
-
-  bool Send(IPC::Message* msg);
-
-  // ServiceWorkerScriptContext calls our OnMessageReceived directly.
-  bool OnMessageReceived(const IPC::Message& message);
-
-  // Message handlers for CacheStorage messages from the browser process.
-  void OnCacheStorageHasSuccess(int thread_id, int request_id);
-  void OnCacheStorageOpenSuccess(int thread_id, int request_id, int cache_id);
-  void OnCacheStorageDeleteSuccess(int thread_id, int request_id);
-  void OnCacheStorageKeysSuccess(int thread_id,
-                                 int request_id,
-                                 const std::vector<base::string16>& keys);
-  void OnCacheStorageMatchSuccess(int thread_id,
-                                  int request_id,
-                                  const ServiceWorkerResponse& response);
-
-  void OnCacheStorageHasError(int thread_id,
-                              int request_id,
-                              blink::WebServiceWorkerCacheError reason);
-  void OnCacheStorageOpenError(int thread_id,
-                               int request_id,
-                               blink::WebServiceWorkerCacheError reason);
-  void OnCacheStorageDeleteError(int thread_id,
-                                 int request_id,
-                                 blink::WebServiceWorkerCacheError reason);
-  void OnCacheStorageKeysError(int thread_id,
-                               int request_id,
-                               blink::WebServiceWorkerCacheError reason);
-  void OnCacheStorageMatchError(int thread_id,
-                                int request_id,
-                                blink::WebServiceWorkerCacheError reason);
-
-  // Message handlers for Cache messages from the browser process.
-  void OnCacheMatchSuccess(int thread_id,
-                           int request_id,
-                           const ServiceWorkerResponse& response);
-  void OnCacheMatchAllSuccess(
-      int thread_id,
-      int request_id,
-      const std::vector<ServiceWorkerResponse>& response);
-  void OnCacheKeysSuccess(
-      int thread_id,
-      int request_id,
-      const std::vector<ServiceWorkerFetchRequest>& response);
-  void OnCacheBatchSuccess(int thread_id,
-                           int request_id,
-                           const std::vector<ServiceWorkerResponse>& response);
-
-  void OnCacheMatchError(int thread_id,
-                         int request_id,
-                         blink::WebServiceWorkerCacheError reason);
-  void OnCacheMatchAllError(int thread_id,
-                            int request_id,
-                            blink::WebServiceWorkerCacheError reason);
-  void OnCacheKeysError(int thread_id,
-                        int request_id,
-                        blink::WebServiceWorkerCacheError reason);
-  void OnCacheBatchError(int thread_id,
-                         int request_id,
-                         blink::WebServiceWorkerCacheError reason);
-
-  // TODO(jsbell): These are only called by WebServiceWorkerCacheStorageImpl
-  // and should be renamed to match Chromium conventions. crbug.com/439389
-  void dispatchHas(
-      blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
-      const GURL& origin,
-      const blink::WebString& cacheName);
-  void dispatchOpen(
-      blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks*
-          callbacks,
-      const GURL& origin,
-      const blink::WebString& cacheName);
-  void dispatchDelete(
-      blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
-      const GURL& origin,
-      const blink::WebString& cacheName);
-  void dispatchKeys(
-      blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks* callbacks,
-      const GURL& origin);
-  void dispatchMatch(
-      blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks*
-          callbacks,
-      const GURL& origin,
-      const blink::WebServiceWorkerRequest& request,
-      const blink::WebServiceWorkerCache::QueryParams& query_params);
-
-  // These methods are used by WebCache to forward events to the browser
-  // process.
-  void dispatchMatchForCache(
-      int cache_id,
-      blink::WebServiceWorkerCache::CacheMatchCallbacks* callbacks,
-      const blink::WebServiceWorkerRequest& request,
-      const blink::WebServiceWorkerCache::QueryParams& query_params);
-  void dispatchMatchAllForCache(
-      int cache_id,
-      blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks,
-      const blink::WebServiceWorkerRequest& request,
-      const blink::WebServiceWorkerCache::QueryParams& query_params);
-  void dispatchKeysForCache(
-      int cache_id,
-      blink::WebServiceWorkerCache::CacheWithRequestsCallbacks* callbacks,
-      const blink::WebServiceWorkerRequest* request,
-      const blink::WebServiceWorkerCache::QueryParams& query_params);
-  void dispatchBatchForCache(
-      int cache_id,
-      blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks,
-      const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
-          batch_operations);
-
-  void OnWebCacheDestruction(int cache_id);
-
- private:
-  class WebCache;
-
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks,
-                IDMapOwnPointer> CallbacksMap;
-  typedef IDMap<
-      blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks,
-      IDMapOwnPointer> WithCacheCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks,
-                IDMapOwnPointer> KeysCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks,
-                IDMapOwnPointer> StorageMatchCallbacksMap;
-
-  typedef base::hash_map<int32, base::TimeTicks> TimeMap;
-
-  typedef IDMap<blink::WebServiceWorkerCache::CacheMatchCallbacks,
-                IDMapOwnPointer> MatchCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCache::CacheWithResponsesCallbacks,
-                IDMapOwnPointer> WithResponsesCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCache::CacheWithRequestsCallbacks,
-                IDMapOwnPointer> WithRequestsCallbacksMap;
-
-  static int32 CurrentWorkerId() {
-    return WorkerTaskRunner::Instance()->CurrentWorkerId();
-  }
-
-  void PopulateWebResponseFromResponse(
-      const ServiceWorkerResponse& response,
-      blink::WebServiceWorkerResponse* web_response);
-
-  blink::WebVector<blink::WebServiceWorkerResponse> WebResponsesFromResponses(
-      const std::vector<ServiceWorkerResponse>& responses);
-
-  scoped_refptr<ThreadSafeSender> thread_safe_sender_;
-
-  CallbacksMap has_callbacks_;
-  WithCacheCallbacksMap open_callbacks_;
-  CallbacksMap delete_callbacks_;
-  KeysCallbacksMap keys_callbacks_;
-  StorageMatchCallbacksMap match_callbacks_;
-
-  TimeMap has_times_;
-  TimeMap open_times_;
-  TimeMap delete_times_;
-  TimeMap keys_times_;
-  TimeMap match_times_;
-
-  // The individual caches created under this CacheStorage object.
-  IDMap<WebCache, IDMapExternalPointer> web_caches_;
-
-  // These ID maps are held in the CacheStorage object rather than the Cache
-  // object to ensure that the IDs are unique.
-  MatchCallbacksMap cache_match_callbacks_;
-  WithResponsesCallbacksMap cache_match_all_callbacks_;
-  WithRequestsCallbacksMap cache_keys_callbacks_;
-  WithResponsesCallbacksMap cache_batch_callbacks_;
-
-  TimeMap cache_match_times_;
-  TimeMap cache_match_all_times_;
-  TimeMap cache_keys_times_;
-  TimeMap cache_batch_times_;
-
-  base::WeakPtrFactory<ServiceWorkerCacheStorageDispatcher> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCacheStorageDispatcher);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_DISPATCHER_H_