[ServiceWorker] Apply OnceCallback through impl of service_worker_client_utils

BUG=

Change-Id: I6b5b28230390de1f3b8a105c1f750fc394dfe923
Reviewed-on: https://chromium-review.googlesource.com/886004Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Commit-Queue: Han Leon <leon.han@intel.com>
Cr-Commit-Position: refs/heads/master@{#531842}

content/browser/service_worker/service_worker_client_utils.h

@@ -24,22 +24,22 @@ class ServiceWorkerVersion;
 
 namespace service_worker_client_utils {
 
-using NavigationCallback = base::Callback<void(
+using NavigationCallback = base::OnceCallback<void(
     ServiceWorkerStatusCode status,
     const blink::mojom::ServiceWorkerClientInfo& client_info)>;
-using ClientCallback = base::Callback<void(
+using ClientCallback = base::OnceCallback<void(
     const blink::mojom::ServiceWorkerClientInfo& client_info)>;
 using GetClientCallback = base::OnceCallback<void(
     blink::mojom::ServiceWorkerClientInfoPtr client_info)>;
 using ServiceWorkerClientPtrs =
     std::vector<blink::mojom::ServiceWorkerClientInfoPtr>;
 using ClientsCallback =
-    base::Callback<void(std::unique_ptr<ServiceWorkerClientPtrs> clients)>;
+    base::OnceCallback<void(std::unique_ptr<ServiceWorkerClientPtrs> clients)>;
 
 // Focuses the window client associated with |provider_host|. |callback| is
 // called with the client information on completion.
 void FocusWindowClient(ServiceWorkerProviderHost* provider_host,
-                       const ClientCallback& callback);
+                       ClientCallback callback);
 
 // Opens a new window and navigates it to |url|. |callback| is called with the
 // window's client information on completion.
@@ -48,7 +48,7 @@ void OpenWindow(const GURL& url,
                 int worker_process_id,
                 const base::WeakPtr<ServiceWorkerContextCore>& context,
                 WindowOpenDisposition disposition,
-                const NavigationCallback& callback);
+                NavigationCallback callback);
 
 // Navigates the client specified by |process_id| and |frame_id| to |url|.
 // |callback| is called with the client information on completion.
@@ -57,7 +57,7 @@ void NavigateClient(const GURL& url,
                     int process_id,
                     int frame_id,
                     const base::WeakPtr<ServiceWorkerContextCore>& context,
-                    const NavigationCallback& callback);
+                    NavigationCallback callback);
 
 // Gets the client specified by |provider_host|. |callback| is called with the
 // client information on completion.
@@ -68,7 +68,7 @@ void GetClient(const ServiceWorkerProviderHost* provider_host,
 // information sorted in MRU order (most recently focused order) on completion.
 void GetClients(const base::WeakPtr<ServiceWorkerVersion>& controller,
                 blink::mojom::ServiceWorkerClientQueryOptionsPtr options,
-                const ClientsCallback& callback);
+                ClientsCallback callback);
 
 // Finds the provider host for |origin| in |context| then uses
 // |render_process_id| and |render_process_host| to create a relevant
@@ -76,7 +76,7 @@ void GetClients(const base::WeakPtr<ServiceWorkerVersion>& controller,
 // Must be called on the IO thread.
 void DidNavigate(const base::WeakPtr<ServiceWorkerContextCore>& context,
                  const GURL& origin,
-                 const NavigationCallback& callback,
+                 NavigationCallback callback,
                  int render_process_id,
                  int render_frame_id);
 

content/browser/service_worker/service_worker_version.cc

@@ -200,16 +200,17 @@ CompleteProviderHostPreparation(
 void DidNavigateInPaymentHandlerWindow(
     const GURL& url,
     const base::WeakPtr<ServiceWorkerContextCore>& context,
-    const service_worker_client_utils::NavigationCallback& callback,
+    service_worker_client_utils::NavigationCallback callback,
     bool success,
     int render_process_id,
     int render_frame_id) {
   if (success) {
     service_worker_client_utils::DidNavigate(
-        context, url.GetOrigin(), callback, render_process_id, render_frame_id);
+        context, url.GetOrigin(), std::move(callback), render_process_id,
+        render_frame_id);
   } else {
-    callback.Run(SERVICE_WORKER_ERROR_FAILED,
-                 blink::mojom::ServiceWorkerClientInfo());
+    std::move(callback).Run(SERVICE_WORKER_ERROR_FAILED,
+                            blink::mojom::ServiceWorkerClientInfo());
   }
 }
 
@@ -1133,8 +1134,7 @@ void ServiceWorkerVersion::GetClients(
     GetClientsCallback callback) {
   service_worker_client_utils::GetClients(
       weak_factory_.GetWeakPtr(), std::move(options),
-      base::AdaptCallbackForRepeating(
-          base::BindOnce(&DidGetClients, std::move(callback))));
+      base::BindOnce(&DidGetClients, std::move(callback)));
 }
 
 void ServiceWorkerVersion::OnSetCachedMetadataFinished(int64_t callback_id,
@@ -1247,9 +1247,10 @@ void ServiceWorkerVersion::OnOpenPaymentHandlerWindow(int request_id,
       base::BindOnce(
           &ShowPaymentHandlerWindowOnUI, GetContentClient()->browser(),
           base::WrapRefCounted(context_->wrapper()), url,
-          base::BindOnce(&DidNavigateInPaymentHandlerWindow, url, context_,
-                         base::Bind(&ServiceWorkerVersion::OnOpenWindowFinished,
-                                    weak_factory_.GetWeakPtr(), request_id)),
+          base::BindOnce(
+              &DidNavigateInPaymentHandlerWindow, url, context_,
+              base::BindOnce(&ServiceWorkerVersion::OnOpenWindowFinished,
+                             weak_factory_.GetWeakPtr(), request_id)),
           base::BindOnce(&ServiceWorkerVersion::OnOpenWindow,
                          weak_factory_.GetWeakPtr(), request_id, url,
                          WindowOpenDisposition::NEW_POPUP)));
@@ -1288,8 +1289,8 @@ void ServiceWorkerVersion::OnOpenWindow(int request_id,
 
   service_worker_client_utils::OpenWindow(
       url, script_url_, embedded_worker_->process_id(), context_, disposition,
-      base::Bind(&ServiceWorkerVersion::OnOpenWindowFinished,
-                 weak_factory_.GetWeakPtr(), request_id));
+      base::BindOnce(&ServiceWorkerVersion::OnOpenWindowFinished,
+                     weak_factory_.GetWeakPtr(), request_id));
 }
 
 void ServiceWorkerVersion::OnOpenWindowFinished(
@@ -1361,8 +1362,9 @@ void ServiceWorkerVersion::OnFocusClient(int request_id,
   }
 
   service_worker_client_utils::FocusWindowClient(
-      provider_host, base::Bind(&ServiceWorkerVersion::OnFocusClientFinished,
-                                weak_factory_.GetWeakPtr(), request_id));
+      provider_host,
+      base::BindOnce(&ServiceWorkerVersion::OnFocusClientFinished,
+                     weak_factory_.GetWeakPtr(), request_id));
 }
 
 void ServiceWorkerVersion::OnFocusClientFinished(
@@ -1415,8 +1417,9 @@ void ServiceWorkerVersion::OnNavigateClient(int request_id,
 
   service_worker_client_utils::NavigateClient(
       url, script_url_, provider_host->process_id(), provider_host->frame_id(),
-      context_, base::Bind(&ServiceWorkerVersion::OnNavigateClientFinished,
-                           weak_factory_.GetWeakPtr(), request_id));
+      context_,
+      base::BindOnce(&ServiceWorkerVersion::OnNavigateClientFinished,
+                     weak_factory_.GetWeakPtr(), request_id));
 }
 
 void ServiceWorkerVersion::OnNavigateClientFinished(