Migrate ServiceWorkerScriptCacheMap methods to net::CompletionOnceCallback

Replace usage of net::CompletionCallback and update callers.

Bug: 807724
Change-Id: I90f180fa481ea20e5e67aaab08f27e421342ca39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1524045
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#641133}

content/browser/service_worker/service_worker_script_cache_map.cc

@@ -4,6 +4,8 @@
 
 #include "content/browser/service_worker/service_worker_script_cache_map.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ -90,16 +92,16 @@ void ServiceWorkerScriptCacheMap::SetResources(
 void ServiceWorkerScriptCacheMap::WriteMetadata(
     const GURL& url,
     const std::vector<uint8_t>& data,
-    const net::CompletionCallback& callback) {
+    net::CompletionOnceCallback callback) {
   if (!context_) {
-    callback.Run(net::ERR_ABORTED);
+    std::move(callback).Run(net::ERR_ABORTED);
     return;
   }
 
   auto found = resource_map_.find(url);
   if (found == resource_map_.end() ||
       found->second.resource_id == kInvalidServiceWorkerResourceId) {
-    callback.Run(net::ERR_FILE_NOT_FOUND);
+    std::move(callback).Run(net::ERR_FILE_NOT_FOUND);
     return;
   }
 
@@ -114,20 +116,21 @@ void ServiceWorkerScriptCacheMap::WriteMetadata(
   raw_writer->WriteMetadata(
       buffer.get(), data.size(),
       base::BindOnce(&ServiceWorkerScriptCacheMap::OnMetadataWritten,
-                     weak_factory_.GetWeakPtr(), std::move(writer), callback));
+                     weak_factory_.GetWeakPtr(), std::move(writer),
+                     std::move(callback)));
 }
 
 void ServiceWorkerScriptCacheMap::ClearMetadata(
     const GURL& url,
-    const net::CompletionCallback& callback) {
-  WriteMetadata(url, std::vector<uint8_t>(), callback);
+    net::CompletionOnceCallback callback) {
+  WriteMetadata(url, std::vector<uint8_t>(), std::move(callback));
 }
 
 void ServiceWorkerScriptCacheMap::OnMetadataWritten(
     std::unique_ptr<ServiceWorkerResponseMetadataWriter> writer,
-    const net::CompletionCallback& callback,
+    net::CompletionOnceCallback callback,
     int result) {
-  callback.Run(result);
+  std::move(callback).Run(result);
 }
 
 }  // namespace content

content/browser/service_worker/service_worker_script_cache_map.h

@@ -15,7 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_database.h"
 #include "content/common/content_export.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/url_request/url_request_status.h"
 
 class GURL;
@@ -51,9 +51,9 @@ class CONTENT_EXPORT ServiceWorkerScriptCacheMap {
   // Writes the metadata of the existing script.
   void WriteMetadata(const GURL& url,
                      const std::vector<uint8_t>& data,
-                     const net::CompletionCallback& callback);
+                     net::CompletionOnceCallback callback);
   // Clears the metadata of the existing script.
-  void ClearMetadata(const GURL& url, const net::CompletionCallback& callback);
+  void ClearMetadata(const GURL& url, net::CompletionOnceCallback callback);
 
   size_t size() const { return resource_map_.size(); }
 
@@ -81,7 +81,7 @@ class CONTENT_EXPORT ServiceWorkerScriptCacheMap {
 
   void OnMetadataWritten(
       std::unique_ptr<ServiceWorkerResponseMetadataWriter> writer,
-      const net::CompletionCallback& callback,
+      net::CompletionOnceCallback callback,
       int result);
 
   ServiceWorkerVersion* owner_;

content/browser/service_worker/service_worker_version.cc

@@ -1059,7 +1059,7 @@ void ServiceWorkerVersion::SetCachedMetadata(const GURL& url,
                            callback_id, "URL", url.spec());
   script_cache_map_.WriteMetadata(
       url, data,
-      base::Bind(&ServiceWorkerVersion::OnSetCachedMetadataFinished,
+      base::BindOnce(&ServiceWorkerVersion::OnSetCachedMetadataFinished,
                      weak_factory_.GetWeakPtr(), callback_id, data.size()));
 }
 
@@ -1069,7 +1069,7 @@ void ServiceWorkerVersion::ClearCachedMetadata(const GURL& url) {
                            "ServiceWorkerVersion::ClearCachedMetadata",
                            callback_id, "URL", url.spec());
   script_cache_map_.ClearMetadata(
-      url, base::Bind(&ServiceWorkerVersion::OnClearCachedMetadataFinished,
+      url, base::BindOnce(&ServiceWorkerVersion::OnClearCachedMetadataFinished,
                           weak_factory_.GetWeakPtr(), callback_id));
 }