Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/common/service_worker/cache_storage_messages.h

Index: content/common/service_worker/cache_storage_messages.h
diff --git a/content/common/service_worker/cache_storage_messages.h b/content/common/service_worker/cache_storage_messages.h
new file mode 100644
index 0000000000000000000000000000000000000000..91ea536281dbff727a896e390da4052ff4b848a3
--- /dev/null
+++ b/content/common/service_worker/cache_storage_messages.h
@@ -0,0 +1,197 @@
+// Copyright 2015 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_types.h"
+#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_param_traits.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerCacheError.h"
+#include "url/gurl.h"
+
+#undef IPC_MESSAGE_EXPORT
+#define IPC_MESSAGE_EXPORT CONTENT_EXPORT
+
+#define IPC_MESSAGE_START CacheStorageMsgStart
+
+// TODO(jsbell): This depends on traits for content::ServiceWorkerResponse
+// which are defined in service_worker_messages.h - correct this implicit
+// cross-dependency.
+
+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_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerCacheError,
+                          blink::WebServiceWorkerCacheErrorLast)
+
+//---------------------------------------------------------------------------
+// Messages sent from the child process to the browser.
+
+// CacheStorage operations in the browser.
+IPC_MESSAGE_CONTROL4(ServiceWorkerHostMsg_CacheStorageHas,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     GURL /* origin */,
+                     base::string16 /* fetch_store_name */)
+
+IPC_MESSAGE_CONTROL4(ServiceWorkerHostMsg_CacheStorageOpen,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     GURL /* origin */,
+                     base::string16 /* fetch_store_name */)
+
+IPC_MESSAGE_CONTROL4(ServiceWorkerHostMsg_CacheStorageDelete,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     GURL /* origin */,
+                     base::string16 /* fetch_store_name */)
+
+IPC_MESSAGE_CONTROL3(ServiceWorkerHostMsg_CacheStorageKeys,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     GURL /* origin */)
+
+IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_CacheStorageMatch,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     GURL /* origin */,
+                     content::ServiceWorkerFetchRequest,
+                     content::ServiceWorkerCacheQueryParams)
+
+// Cache operations in the browser.
+IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_CacheMatch,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     int /* cache_id */,
+                     content::ServiceWorkerFetchRequest,
+                     content::ServiceWorkerCacheQueryParams)
+
+IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_CacheMatchAll,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     int /* cache_id */,
+                     content::ServiceWorkerFetchRequest,
+                     content::ServiceWorkerCacheQueryParams)
+
+IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_CacheKeys,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     int /* cache_id */,
+                     content::ServiceWorkerFetchRequest,
+                     content::ServiceWorkerCacheQueryParams)
+
+IPC_MESSAGE_CONTROL4(ServiceWorkerHostMsg_CacheBatch,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     int /* cache_id */,
+                     std::vector<content::ServiceWorkerBatchOperation>)
+
+IPC_MESSAGE_CONTROL1(ServiceWorkerHostMsg_CacheClosed,
+                     int /* cache_id */)
+
+IPC_MESSAGE_CONTROL1(ServiceWorkerHostMsg_BlobDataHandled,
+                     std::string /* uuid */)
+
+//---------------------------------------------------------------------------
+// Messages sent from the browser to the child process.
+//
+// All such messages must includes thread_id as the first int; it is read off
+// by CacheStorageMessageFilter::GetWorkerThreadIdForMessage to route delivery
+// to the appropriate thread.
+
+// Sent at successful completion of CacheStorage operations.
+IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageHasSuccess,
+                     int /* thread_id */,
+                     int /* request_id */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageOpenSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     int /* fetch_store_id */)
+IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CacheStorageDeleteSuccess,
+                     int /* thread_id */,
+                     int /* request_id */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageKeysSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     std::vector<base::string16> /* keys */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageMatchSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     content::ServiceWorkerResponse)
+
+// Sent at erroneous completion of CacheStorage operations.
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageHasError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError /* reason */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageOpenError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError /* reason */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageDeleteError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError /* reason */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageKeysError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError /* reason */)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheStorageMatchError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError)
+
+// Sent at successful completion of Cache operations.
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheMatchSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     content::ServiceWorkerResponse)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheMatchAllSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     std::vector<content::ServiceWorkerResponse>)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheKeysSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     std::vector<content::ServiceWorkerFetchRequest>)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheBatchSuccess,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     std::vector<content::ServiceWorkerResponse>)
+
+// Sent at erroneous completion of CacheStorage operations.
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheMatchError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheMatchAllError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheKeysError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError)
+IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_CacheBatchError,
+                     int /* thread_id */,
+                     int /* request_id */,
+                     blink::WebServiceWorkerCacheError)