Rename blink/renderer/modules/cachestorage to cache_storage.

This is consistent with public/platform/modules/cache_storage and
content/*/cache_storage.

Change-Id: Idb67f16bccfce3f035a9375e10a5ea5f4a99647f
Reviewed-on: https://chromium-review.googlesource.com/1028998Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553858}

third_party/blink/renderer/modules/BUILD.gn

@@ -98,7 +98,7 @@ target("jumbo_" + modules_target_type, "modules") {
     "//third_party/blink/renderer/modules/bluetooth",
     "//third_party/blink/renderer/modules/broadcastchannel",
     "//third_party/blink/renderer/modules/budget",
-    "//third_party/blink/renderer/modules/cachestorage",
+    "//third_party/blink/renderer/modules/cache_storage",
     "//third_party/blink/renderer/modules/canvas",
     "//third_party/blink/renderer/modules/clipboard",
     "//third_party/blink/renderer/modules/cookie_store",
@@ -238,7 +238,7 @@ jumbo_source_set("unit_tests") {
     "background_fetch/background_fetch_icon_loader_test.cc",
     "background_fetch/background_fetch_manager_test.cc",
     "background_fetch/background_fetch_settled_fetches_test.cc",
-    "cachestorage/cache_test.cc",
+    "cache_storage/cache_test.cc",
     "canvas/canvas2d/canvas_rendering_context_2d_api_test.cc",
     "canvas/canvas2d/canvas_rendering_context_2d_test.cc",
     "canvas/htmlcanvas/html_canvas_element_module_test.cc",

third_party/blink/renderer/modules/cachestorage/BUILD.gn → third_party/blink/renderer/modules/cache_storage/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//third_party/blink/renderer/modules/modules.gni")
 
-blink_modules_sources("cachestorage") {
+blink_modules_sources("cache_storage") {
   sources = [
     "cache.cc",
     "cache.h",

third_party/blink/renderer/modules/cachestorage/DEPS → third_party/blink/renderer/modules/cache_storage/DEPS

 include_rules = [
     "+services/network/public/mojom",
     "-third_party/blink/renderer/modules",
-    "+third_party/blink/renderer/modules/cachestorage",
+    "+third_party/blink/renderer/modules/cache_storage",
     "+third_party/blink/renderer/modules/event_modules.h",
     "+third_party/blink/renderer/modules/event_target_modules.h",
     "+third_party/blink/renderer/modules/modules_export.h",

third_party/blink/renderer/modules/cachestorage/cache.cc → third_party/blink/renderer/modules/cache_storage/cache.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/cache.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache.h"
 
 #include <memory>
 #include <utility>
@@ -26,7 +26,7 @@
 #include "third_party/blink/renderer/core/fetch/response.h"
 #include "third_party/blink/renderer/core/html/parser/text_resource_decoder.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache_storage_error.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_storage_error.h"
 #include "third_party/blink/renderer/modules/serviceworkers/service_worker_global_scope.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_throw_exception.h"
@@ -89,9 +89,10 @@ class CacheWithResponsesCallbacks
       return;
     ScriptState::Scope scope(resolver_->GetScriptState());
     HeapVector<Member<Response>> responses;
-    for (size_t i = 0; i < web_responses.size(); ++i)
+    for (size_t i = 0; i < web_responses.size(); ++i) {
       responses.push_back(
           Response::Create(resolver_->GetScriptState(), web_responses[i]));
+    }
     resolver_->Resolve(responses);
     resolver_.Clear();
   }
@@ -155,9 +156,10 @@ class CacheWithRequestsCallbacks
       return;
     ScriptState::Scope scope(resolver_->GetScriptState());
     HeapVector<Member<Request>> requests;
-    for (size_t i = 0; i < web_requests.size(); ++i)
+    for (size_t i = 0; i < web_requests.size(); ++i) {
       requests.push_back(
           Request::Create(resolver_->GetScriptState(), web_requests[i]));
+    }
     resolver_->Resolve(requests);
     resolver_.Clear();
   }
@@ -587,10 +589,11 @@ ScriptPromise Cache::put(ScriptState* script_state,
                          Response* response,
                          ExceptionState& exception_state) {
   DCHECK(!request.IsNull());
-  if (request.IsRequest())
+  if (request.IsRequest()) {
     return PutImpl(script_state,
                    HeapVector<Member<Request>>(1, request.GetAsRequest()),
                    HeapVector<Member<Response>>(1, response));
+  }
   Request* new_request =
       Request::Create(script_state, request.GetAsUSVString(), exception_state);
   if (exception_state.HadException())
@@ -692,18 +695,20 @@ ScriptPromise Cache::AddAllImpl(ScriptState* script_state,
   Vector<ScriptPromise> promises;
   promises.resize(requests.size());
   for (size_t i = 0; i < requests.size(); ++i) {
-    if (!requests[i]->url().ProtocolIsInHTTPFamily())
+    if (!requests[i]->url().ProtocolIsInHTTPFamily()) {
       return ScriptPromise::Reject(script_state,
                                    V8ThrowException::CreateTypeError(
                                        script_state->GetIsolate(),
                                        "Add/AddAll does not support schemes "
                                        "other than \"http\" or \"https\""));
-    if (requests[i]->method() != HTTPNames::GET)
+    }
+    if (requests[i]->method() != HTTPNames::GET) {
       return ScriptPromise::Reject(
           script_state,
           V8ThrowException::CreateTypeError(
               script_state->GetIsolate(),
               "Add/AddAll only supports the GET request method."));
+    }
     request_infos[i].SetRequest(requests[i]);
 
     promises[i] = scoped_fetcher_->Fetch(script_state, request_infos[i],

third_party/blink/renderer/modules/cachestorage/cache.h → third_party/blink/renderer/modules/cache_storage/cache.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_H_
 
 #include <memory>
+#include "base/macros.h"
 #include "third_party/blink/public/platform/modules/serviceworker/web_service_worker_cache.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/core/fetch/global_fetch.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache_query_options.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_query_options.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
-#include "third_party/blink/renderer/platform/wtf/noncopyable.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
@@ -28,7 +28,6 @@ typedef RequestOrUSVString RequestInfo;
 
 class MODULES_EXPORT Cache final : public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
-  WTF_MAKE_NONCOPYABLE(Cache);
 
  public:
   static Cache* Create(GlobalFetch::ScopedFetcher*,
@@ -100,8 +99,10 @@ class MODULES_EXPORT Cache final : public ScriptWrappable {
 
   Member<GlobalFetch::ScopedFetcher> scoped_fetcher_;
   std::unique_ptr<WebServiceWorkerCache> web_cache_;
+
+  DISALLOW_COPY_AND_ASSIGN(Cache);
 };
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_H_

third_party/blink/renderer/modules/cachestorage/cache_storage.cc → third_party/blink/renderer/modules/cache_storage/cache_storage.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/cache_storage.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_storage.h"
 
 #include <memory>
 #include <utility>
@@ -17,7 +17,7 @@
 #include "third_party/blink/renderer/core/fetch/request.h"
 #include "third_party/blink/renderer/core/fetch/response.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache_storage_error.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_storage_error.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/network/http_names.h"
 
@@ -163,8 +163,7 @@ class CacheStorage::DeleteCallbacks final
   DeleteCallbacks(const String& cache_name,
                   CacheStorage* cache_storage,
                   ScriptPromiseResolver* resolver)
-      : cache_name_(cache_name),
-        resolver_(resolver) {}
+      : cache_name_(cache_name), resolver_(resolver) {}
   ~DeleteCallbacks() override = default;
 
   void OnSuccess() override {

third_party/blink/renderer/modules/cachestorage/cache_storage.h → third_party/blink/renderer/modules/cache_storage/cache_storage.h

@@ -2,29 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_H_
 
 #include <memory>
+#include "base/macros.h"
 #include "third_party/blink/public/platform/modules/serviceworker/web_service_worker_cache_storage.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/core/fetch/global_fetch.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache_query_options.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_query_options.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.h"
-#include "third_party/blink/renderer/platform/wtf/noncopyable.h"
 
 namespace blink {
 
-class Cache;
 class WebServiceWorkerCacheStorage;
 
 class CacheStorage final : public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
-  WTF_MAKE_NONCOPYABLE(CacheStorage);
 
  public:
   static CacheStorage* Create(GlobalFetch::ScopedFetcher*,
@@ -61,8 +59,10 @@ class CacheStorage final : public ScriptWrappable {
 
   Member<GlobalFetch::ScopedFetcher> scoped_fetcher_;
   std::unique_ptr<WebServiceWorkerCacheStorage> web_cache_storage_;
+
+  DISALLOW_COPY_AND_ASSIGN(CacheStorage);
 };
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_H_

third_party/blink/renderer/modules/cachestorage/cache_storage_error.cc → third_party/blink/renderer/modules/cache_storage/cache_storage_error.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/cache_storage_error.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_storage_error.h"
 
 #include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
 #include "third_party/blink/renderer/core/dom/exception_code.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache.h"
 
 namespace blink {
 

third_party/blink/renderer/modules/cachestorage/cache_storage_error.h → third_party/blink/renderer/modules/cache_storage/cache_storage_error.h

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_ERROR_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_ERROR_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_ERROR_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_ERROR_H_
 
 #include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
-#include "third_party/blink/renderer/platform/wtf/noncopyable.h"
 
 namespace blink {
 
@@ -31,4 +30,4 @@ class CacheStorageError {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_CACHE_STORAGE_ERROR_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_ERROR_H_

third_party/blink/renderer/modules/cachestorage/cache_test.cc → third_party/blink/renderer/modules/cache_storage/cache_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/cache.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache.h"
 
 #include <algorithm>
 #include <memory>

third_party/blink/renderer/modules/cachestorage/global_cache_storage.cc → third_party/blink/renderer/modules/cache_storage/global_cache_storage.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/global_cache_storage.h"
+#include "third_party/blink/renderer/modules/cache_storage/global_cache_storage.h"
 
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_security_origin.h"
@@ -10,7 +10,7 @@
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/use_counter.h"
 #include "third_party/blink/renderer/core/workers/worker_global_scope.h"
-#include "third_party/blink/renderer/modules/cachestorage/cache_storage.h"
+#include "third_party/blink/renderer/modules/cache_storage/cache_storage.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 
@@ -46,18 +46,21 @@ class GlobalCacheStorageImpl final
   CacheStorage* Caches(T& fetching_scope, ExceptionState& exception_state) {
     ExecutionContext* context = fetching_scope.GetExecutionContext();
     if (!context->GetSecurityOrigin()->CanAccessCacheStorage()) {
-      if (context->GetSecurityContext().IsSandboxed(kSandboxOrigin))
+      if (context->GetSecurityContext().IsSandboxed(kSandboxOrigin)) {
         exception_state.ThrowSecurityError(
             "Cache storage is disabled because the context is sandboxed and "
             "lacks the 'allow-same-origin' flag.");
-      else if (context->Url().ProtocolIs("data"))
+      } else if (context->Url().ProtocolIs("data")) {
         exception_state.ThrowSecurityError(
             "Cache storage is disabled inside 'data:' URLs.");
-      else
+      } else {
         exception_state.ThrowSecurityError(
             "Access to cache storage is denied.");
+      }
       return nullptr;
-    } else if (context->GetSecurityOrigin()->IsLocal()) {
+    }
+
+    if (context->GetSecurityOrigin()->IsLocal()) {
       UseCounter::Count(context, WebFeature::kFileAccessedCache);
     }
 

third_party/blink/renderer/modules/cachestorage/global_cache_storage.h → third_party/blink/renderer/modules/cache_storage/global_cache_storage.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_GLOBAL_CACHE_STORAGE_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_GLOBAL_CACHE_STORAGE_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_GLOBAL_CACHE_STORAGE_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_GLOBAL_CACHE_STORAGE_H_
 
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
 
@@ -24,4 +24,4 @@ class GlobalCacheStorage {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_GLOBAL_CACHE_STORAGE_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_GLOBAL_CACHE_STORAGE_H_

third_party/blink/renderer/modules/cachestorage/inspector_cache_storage_agent.cc → third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/cachestorage/inspector_cache_storage_agent.h"
+#include "third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
+#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/public/platform/modules/serviceworker/web_service_worker_cache.h"
@@ -32,7 +33,6 @@
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
-#include "third_party/blink/renderer/platform/wtf/noncopyable.h"
 #include "third_party/blink/renderer/platform/wtf/ref_counted.h"
 #include "third_party/blink/renderer/platform/wtf/text/base64.h"
 #include "third_party/blink/renderer/platform/wtf/time.h"
@@ -178,8 +178,6 @@ CString CacheStorageErrorString(mojom::CacheStorageError error) {
 
 class RequestCacheNames
     : public WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks {
-  WTF_MAKE_NONCOPYABLE(RequestCacheNames);
-
  public:
   RequestCacheNames(const String& security_origin,
                     std::unique_ptr<RequestCacheNamesCallback> callback)
@@ -212,6 +210,8 @@ class RequestCacheNames
  private:
   String security_origin_;
   std::unique_ptr<RequestCacheNamesCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(RequestCacheNames);
 };
 
 struct DataRequestParams {
@@ -231,8 +231,6 @@ struct RequestResponse {
 };
 
 class ResponsesAccumulator : public RefCounted<ResponsesAccumulator> {
-  WTF_MAKE_NONCOPYABLE(ResponsesAccumulator);
-
  public:
   ResponsesAccumulator(int num_responses,
                        const DataRequestParams& params,
@@ -312,12 +310,12 @@ class ResponsesAccumulator : public RefCounted<ResponsesAccumulator> {
   int num_responses_left_;
   Vector<RequestResponse> responses_;
   std::unique_ptr<RequestEntriesCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResponsesAccumulator);
 };
 
 class GetCacheResponsesForRequestData
     : public WebServiceWorkerCache::CacheMatchCallbacks {
-  WTF_MAKE_NONCOPYABLE(GetCacheResponsesForRequestData);
-
  public:
   GetCacheResponsesForRequestData(const DataRequestParams& params,
                                   const WebServiceWorkerRequest& request,
@@ -340,12 +338,12 @@ class GetCacheResponsesForRequestData
   DataRequestParams params_;
   WebServiceWorkerRequest request_;
   scoped_refptr<ResponsesAccumulator> accumulator_;
+
+  DISALLOW_COPY_AND_ASSIGN(GetCacheResponsesForRequestData);
 };
 
 class GetCacheKeysForRequestData
     : public WebServiceWorkerCache::CacheWithRequestsCallbacks {
-  WTF_MAKE_NONCOPYABLE(GetCacheKeysForRequestData);
-
  public:
   GetCacheKeysForRequestData(const DataRequestParams& params,
                              std::unique_ptr<WebServiceWorkerCache> cache,
@@ -385,12 +383,12 @@ class GetCacheKeysForRequestData
   DataRequestParams params_;
   std::unique_ptr<WebServiceWorkerCache> cache_;
   std::unique_ptr<RequestEntriesCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(GetCacheKeysForRequestData);
 };
 
 class GetCacheForRequestData
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
-  WTF_MAKE_NONCOPYABLE(GetCacheForRequestData);
-
  public:
   GetCacheForRequestData(const DataRequestParams& params,
                          std::unique_ptr<RequestEntriesCallback> callback)
@@ -414,11 +412,11 @@ class GetCacheForRequestData
  private:
   DataRequestParams params_;
   std::unique_ptr<RequestEntriesCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(GetCacheForRequestData);
 };
 
 class DeleteCache : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
-  WTF_MAKE_NONCOPYABLE(DeleteCache);
-
  public:
   explicit DeleteCache(std::unique_ptr<DeleteCacheCallback> callback)
       : callback_(std::move(callback)) {}
@@ -434,11 +432,11 @@ class DeleteCache : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
 
  private:
   std::unique_ptr<DeleteCacheCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeleteCache);
 };
 
 class DeleteCacheEntry : public WebServiceWorkerCache::CacheBatchCallbacks {
-  WTF_MAKE_NONCOPYABLE(DeleteCacheEntry);
-
  public:
   explicit DeleteCacheEntry(std::unique_ptr<DeleteEntryCallback> callback)
       : callback_(std::move(callback)) {}
@@ -454,12 +452,12 @@ class DeleteCacheEntry : public WebServiceWorkerCache::CacheBatchCallbacks {
 
  private:
   std::unique_ptr<DeleteEntryCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeleteCacheEntry);
 };
 
 class GetCacheForDeleteEntry
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
-  WTF_MAKE_NONCOPYABLE(GetCacheForDeleteEntry);
-
  public:
   GetCacheForDeleteEntry(const String& request_spec,
                          const String& cache_name,
@@ -492,12 +490,12 @@ class GetCacheForDeleteEntry
   String request_spec_;
   String cache_name_;
   std::unique_ptr<DeleteEntryCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(GetCacheForDeleteEntry);
 };
 
 class CachedResponseFileReaderLoaderClient final
     : private FileReaderLoaderClient {
-  WTF_MAKE_NONCOPYABLE(CachedResponseFileReaderLoaderClient);
-
  public:
   static void Load(scoped_refptr<BlobDataHandle> blob,
                    std::unique_ptr<RequestCachedResponseCallback> callback) {
@@ -545,12 +543,12 @@ class CachedResponseFileReaderLoaderClient final
   std::unique_ptr<FileReaderLoader> loader_;
   std::unique_ptr<RequestCachedResponseCallback> callback_;
   scoped_refptr<SharedBuffer> data_;
+
+  DISALLOW_COPY_AND_ASSIGN(CachedResponseFileReaderLoaderClient);
 };
 
 class CachedResponseMatchCallback
     : public WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks {
-  WTF_MAKE_NONCOPYABLE(CachedResponseMatchCallback);
-
  public:
   explicit CachedResponseMatchCallback(
       std::unique_ptr<RequestCachedResponseCallback> callback)
@@ -575,6 +573,8 @@ class CachedResponseMatchCallback
 
  private:
   std::unique_ptr<RequestCachedResponseCallback> callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(CachedResponseMatchCallback);
 };
 }  // namespace
 

third_party/blink/renderer/modules/cachestorage/inspector_cache_storage_agent.h → third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_
 
 #include <memory>
 
@@ -59,4 +59,4 @@ class MODULES_EXPORT InspectorCacheStorageAgent final
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHESTORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_INSPECTOR_CACHE_STORAGE_AGENT_H_

third_party/blink/renderer/modules/modules_idl_files.gni

@@ -88,8 +88,8 @@ modules_idl_files =
           "broadcastchannel/broadcast_channel.idl",
           "budget/budget_service.idl",
           "budget/budget_state.idl",
-          "cachestorage/cache.idl",
-          "cachestorage/cache_storage.idl",
+          "cache_storage/cache.idl",
+          "cache_storage/cache_storage.idl",
           "canvas/canvas2d/canvas_gradient.idl",
           "canvas/canvas2d/canvas_pattern.idl",
           "canvas/canvas2d/canvas_rendering_context_2d.idl",
@@ -463,7 +463,7 @@ modules_dictionary_idl_files =
           "background_sync/sync_event_init.idl",
           "bluetooth/bluetooth_le_scan_filter_init.idl",
           "bluetooth/request_device_options.idl",
-          "cachestorage/cache_query_options.idl",
+          "cache_storage/cache_query_options.idl",
           "canvas/canvas2d/canvas_rendering_context_2d_settings.idl",
           "canvas/canvas2d/hit_region_options.idl",
           "canvas/htmlcanvas/canvas_context_creation_attributes_module.idl",
@@ -670,8 +670,8 @@ modules_dependency_idl_files =
           "bluetooth/navigator_bluetooth.idl",
           "budget/navigator_budget.idl",
           "budget/worker_navigator_budget.idl",
-          "cachestorage/window_cache_storage.idl",
-          "cachestorage/worker_cache_storage.idl",
+          "cache_storage/window_cache_storage.idl",
+          "cache_storage/worker_cache_storage.idl",
           "canvas/htmlcanvas/html_canvas_element_module.idl",
           "canvas/canvas2d/canvas_path.idl",
           "clipboard/navigator_clipboard.idl",

third_party/blink/renderer/modules/modules_initializer.cc

@@ -35,7 +35,7 @@
 #include "third_party/blink/renderer/modules/audio_output_devices/audio_output_device_client.h"
 #include "third_party/blink/renderer/modules/audio_output_devices/audio_output_device_client_impl.h"
 #include "third_party/blink/renderer/modules/audio_output_devices/html_media_element_audio_output_device.h"
-#include "third_party/blink/renderer/modules/cachestorage/inspector_cache_storage_agent.h"
+#include "third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h"
 #include "third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h"
 #include "third_party/blink/renderer/modules/canvas/imagebitmap/image_bitmap_rendering_context.h"
 #include "third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h"