Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/common/service_worker/service_worker_messages.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.
 
 // Message definition file, included multiple times, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "content/common/service_worker/service_worker_client_info.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/message_port_types.h"
 #include "content/public/common/navigator_connect_client.h"
 #include "content/public/common/platform_notification_data.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/public/platform/WebCircularGeofencingRegion.h"
 #include "third_party/WebKit/public/platform/WebGeofencingEventType.h"
-#include "third_party/WebKit/public/platform/WebServiceWorkerCacheError.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerEventResult.h"
 #include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 #define IPC_MESSAGE_START ServiceWorkerMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerError::ErrorType,
@@ skipping 35 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(status_code)
   IPC_STRUCT_TRAITS_MEMBER(status_text)
   IPC_STRUCT_TRAITS_MEMBER(response_type)
   IPC_STRUCT_TRAITS_MEMBER(headers)
   IPC_STRUCT_TRAITS_MEMBER(blob_uuid)
   IPC_STRUCT_TRAITS_MEMBER(blob_size)
   IPC_STRUCT_TRAITS_MEMBER(stream_url)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerCacheQueryParams)
-  IPC_STRUCT_TRAITS_MEMBER(ignore_search)
-  IPC_STRUCT_TRAITS_MEMBER(ignore_method)
-  IPC_STRUCT_TRAITS_MEMBER(ignore_vary)
-  IPC_STRUCT_TRAITS_MEMBER(cache_name)
-IPC_STRUCT_TRAITS_END()
-
-IPC_ENUM_TRAITS_MAX_VALUE(content::ServiceWorkerCacheOperationType,
-                          content::SERVICE_WORKER_CACHE_OPERATION_TYPE_LAST)
-
-IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerBatchOperation)
-  IPC_STRUCT_TRAITS_MEMBER(operation_type)
-  IPC_STRUCT_TRAITS_MEMBER(request)
-  IPC_STRUCT_TRAITS_MEMBER(response)
-  IPC_STRUCT_TRAITS_MEMBER(match_params)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerObjectInfo)
   IPC_STRUCT_TRAITS_MEMBER(handle_id)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(state)
   IPC_STRUCT_TRAITS_MEMBER(version_id)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerRegistrationObjectInfo)
   IPC_STRUCT_TRAITS_MEMBER(handle_id)
   IPC_STRUCT_TRAITS_MEMBER(scope)
@@ skipping 13 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(frame_type)
   IPC_STRUCT_TRAITS_MEMBER(client_type)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientQueryOptions)
   IPC_STRUCT_TRAITS_MEMBER(client_type)
   IPC_STRUCT_TRAITS_MEMBER(include_uncontrolled)
 IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS_MAX_VALUE(
-    blink::WebServiceWorkerCacheError,
-    blink::WebServiceWorkerCacheErrorLast)
-
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebGeofencingEventType,
                           blink::WebGeofencingEventTypeLast)
 
 //---------------------------------------------------------------------------
 // Messages sent from the child process to the browser.
 
 IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_RegisterServiceWorker,
                      int /* thread_id */,
                      int /* request_id */,
                      int /* provider_id */,
@@ skipping 131 matching lines @@
 
 // Asks the browser to force this worker to become activated.
 IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_SkipWaiting,
                     int /* request_id */)
 
 // Asks the browser to have this worker take control of pages that match
 // its scope.
 IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_ClaimClients,
                     int /* request_id */)
 
-// CacheStorage operations in the browser.
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CacheStorageHas,
-                    int /* request_id */,
-                    base::string16 /* fetch_store_name */)
-
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CacheStorageOpen,
-                    int /* request_id */,
-                    base::string16 /* fetch_store_name */)
-
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CacheStorageDelete,
-                    int /* request_id */,
-                    base::string16 /* fetch_store_name */)
-
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_CacheStorageKeys,
-                    int /* request_id */)
-
-IPC_MESSAGE_ROUTED3(ServiceWorkerHostMsg_CacheStorageMatch,
-                    int /* request_id */,
-                    content::ServiceWorkerFetchRequest,
-                    content::ServiceWorkerCacheQueryParams)
-
-// Cache operations in the browser.
-IPC_MESSAGE_ROUTED4(ServiceWorkerHostMsg_CacheMatch,
-                    int /* request_id */,
-                    int /* cache_id */,
-                    content::ServiceWorkerFetchRequest,
-                    content::ServiceWorkerCacheQueryParams)
-
-IPC_MESSAGE_ROUTED4(ServiceWorkerHostMsg_CacheMatchAll,
-                    int /* request_id */,
-                    int /* cache_id */,
-                    content::ServiceWorkerFetchRequest,
-                    content::ServiceWorkerCacheQueryParams)
-
-IPC_MESSAGE_ROUTED4(ServiceWorkerHostMsg_CacheKeys,
-                    int /* request_id */,
-                    int /* cache_id */,
-                    content::ServiceWorkerFetchRequest,
-                    content::ServiceWorkerCacheQueryParams)
-
-IPC_MESSAGE_ROUTED3(ServiceWorkerHostMsg_CacheBatch,
-                    int /* request_id */,
-                    int /* cache_id */,
-                    std::vector<content::ServiceWorkerBatchOperation>)
-
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_CacheClosed,
-                    int /* cache_id */)
-
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_BlobDataHandled,
-                    std::string /* uuid */)
-
 //---------------------------------------------------------------------------
 // Messages sent from the browser to the child process.
 //
 // NOTE: All ServiceWorkerMsg messages not sent via EmbeddedWorker must have
 // a thread_id as their first field so that ServiceWorkerMessageFilter can
 // extract it and dispatch the message to the correct ServiceWorkerDispatcher
 // on the correct thread.
 
 // Informs the child process of the registration associated with the service
 // worker.
@@ skipping 162 matching lines @@
 
 // Sent via EmbeddedWorker as an error response of OpenWindow.
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_OpenWindowError,
                      int /* request_id */,
                      std::string /* message */ )
 
 // Sent via EmbeddedWorker as a response of FocusClient.
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_FocusClientResponse,
                      int /* request_id */,
                      content::ServiceWorkerClientInfo /* client */)
-
-// Sent via EmbeddedWorker at successful completion of CacheStorage operations.
-IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_CacheStorageHasSuccess,
-                     int /* request_id */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageOpenSuccess,
-                     int /* request_id */,
-                     int /* fetch_store_id */)
-IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_CacheStorageDeleteSuccess,
-                     int /* request_id */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageKeysSuccess,
-                     int /* request_id */,
-                     std::vector<base::string16> /* keys */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageMatchSuccess,
-                     int /* request_id */,
-                     content::ServiceWorkerResponse)
-
-// Sent via EmbeddedWorker at erroneous completion of CacheStorage operations.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageHasError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError /* reason */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageOpenError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError /* reason */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageDeleteError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError /* reason */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageKeysError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError /* reason */)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageMatchError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError)
-
-// Sent via EmbeddedWorker at successful completion of Cache operations.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheMatchSuccess,
-                     int /* request_id */,
-                     content::ServiceWorkerResponse)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheMatchAllSuccess,
-                     int /* request_id */,
-                     std::vector<content::ServiceWorkerResponse>)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheKeysSuccess,
-                     int /* request_id */,
-                     std::vector<content::ServiceWorkerFetchRequest>)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheBatchSuccess,
-                     int /* request_id */,
-                     std::vector<content::ServiceWorkerResponse>)
-
-// Sent via EmbeddedWorker at erroneous completion of CacheStorage operations.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheMatchError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheMatchAllError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheKeysError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError)
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheBatchError,
-                     int /* request_id */,
-                     blink::WebServiceWorkerCacheError)