[ServiceWorker] Implement ServiceWorkerHost.GetClient()

This CL mojofies the 2 legacy IPCs:
  ServiceWorkerHostMsg_GetClient
  ServiceWorkerMsg_DidGetClient

BUG=772793

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

content/browser/service_worker/service_worker_version.cc

@@ -253,7 +253,7 @@ void ShowPaymentHandlerWindowOnUI(
 
 void DidGetClients(
     blink::mojom::ServiceWorkerHost::GetClientsCallback callback,
-    std::unique_ptr<std::vector<blink::mojom::ServiceWorkerClientInfoPtr>>
+    std::unique_ptr<service_worker_client_utils::ServiceWorkerClientPtrs>
         clients) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   std::move(callback).Run(std::move(*clients));
@@ -1054,7 +1054,6 @@ void ServiceWorkerVersion::OnReportConsoleMessage(int source_identifier,
 bool ServiceWorkerVersion::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerVersion, message)
-    IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetClient, OnGetClient)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_OpenNewTab, OnOpenNewTab)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_OpenPaymentHandlerWindow,
                         OnOpenPaymentHandlerWindow)
@@ -1137,6 +1136,24 @@ void ServiceWorkerVersion::GetClients(
       base::BindOnce(&DidGetClients, std::move(callback)));
 }
 
+void ServiceWorkerVersion::GetClient(const std::string& client_uuid,
+                                     GetClientCallback callback) {
+  if (!context_) {
+    // The promise will be resolved to 'undefined'.
+    std::move(callback).Run(blink::mojom::ServiceWorkerClientInfo::New());
+    return;
+  }
+  ServiceWorkerProviderHost* provider_host =
+      context_->GetProviderHostByClientID(client_uuid);
+  if (!provider_host ||
+      provider_host->document_url().GetOrigin() != script_url_.GetOrigin()) {
+    // The promise will be resolved to 'undefined'.
+    std::move(callback).Run(blink::mojom::ServiceWorkerClientInfo::New());
+    return;
+  }
+  service_worker_client_utils::GetClient(provider_host, std::move(callback));
+}
+
 void ServiceWorkerVersion::OnSetCachedMetadataFinished(int64_t callback_id,
                                                        size_t size,
                                                        int result) {
@@ -1156,46 +1173,6 @@ void ServiceWorkerVersion::OnClearCachedMetadataFinished(int64_t callback_id,
     listener.OnCachedMetadataUpdated(this, 0);
 }
 
-void ServiceWorkerVersion::OnGetClient(int request_id,
-                                       const std::string& client_uuid) {
-  if (!context_)
-    return;
-  TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "ServiceWorkerVersion::OnGetClient",
-                           request_id, "client_uuid", client_uuid);
-  ServiceWorkerProviderHost* provider_host =
-      context_->GetProviderHostByClientID(client_uuid);
-  if (!provider_host ||
-      provider_host->document_url().GetOrigin() != script_url_.GetOrigin()) {
-    // The promise will be resolved to 'undefined'.
-    OnGetClientFinished(request_id,
-                        blink::mojom::ServiceWorkerClientInfo::New());
-    return;
-  }
-  service_worker_client_utils::GetClient(
-      provider_host, base::BindOnce(&ServiceWorkerVersion::OnGetClientFinished,
-                                    weak_factory_.GetWeakPtr(), request_id));
-}
-
-void ServiceWorkerVersion::OnGetClientFinished(
-    int request_id,
-    blink::mojom::ServiceWorkerClientInfoPtr client_info) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  TRACE_EVENT_ASYNC_END1(
-      "ServiceWorker", "ServiceWorkerVersion::OnGetClient", request_id,
-      "client_type",
-      ServiceWorkerUtils::ClientTypeToString(client_info->client_type));
-
-  // When Clients.get() is called on the script evaluation phase, the running
-  // status can be STARTING here.
-  if (running_status() != EmbeddedWorkerStatus::STARTING &&
-      running_status() != EmbeddedWorkerStatus::RUNNING) {
-    return;
-  }
-
-  embedded_worker_->SendIpcMessage(
-      ServiceWorkerMsg_DidGetClient(request_id, *client_info));
-}
-
 void ServiceWorkerVersion::OnSimpleEventFinished(
     int request_id,
     blink::mojom::ServiceWorkerEventStatus status,

content/browser/service_worker/service_worker_version.h

@@ -630,6 +630,8 @@ class CONTENT_EXPORT ServiceWorkerVersion
   void ClaimClients(ClaimClientsCallback callback) override;
   void GetClients(blink::mojom::ServiceWorkerClientQueryOptionsPtr options,
                   GetClientsCallback callback) override;
+  void GetClient(const std::string& client_uuid,
+                 GetClientCallback callback) override;
 
   void OnSetCachedMetadataFinished(int64_t callback_id,
                                    size_t size,
@@ -638,9 +640,6 @@ class CONTENT_EXPORT ServiceWorkerVersion
 
   // Message handlers.
 
-  // This corresponds to the spec's get(id) steps.
-  void OnGetClient(int request_id, const std::string& client_uuid);
-
   // Currently used for Clients.openWindow() only.
   void OnOpenNewTab(int request_id, const GURL& url);
 
@@ -692,10 +691,6 @@ class CONTENT_EXPORT ServiceWorkerVersion
                              blink::mojom::ServiceWorkerEventStatus status,
                              base::Time dispatch_event_time);
 
-  void OnGetClientFinished(
-      int request_id,
-      blink::mojom::ServiceWorkerClientInfoPtr client_info);
-
   // The timeout timer periodically calls OnTimeoutTimer, which stops the worker
   // if it is excessively idle or unresponsive to ping.
   void StartTimeoutTimer();

content/common/service_worker/service_worker_messages.h

@@ -115,11 +115,6 @@ IPC_MESSAGE_CONTROL5(
 IPC_MESSAGE_CONTROL1(ServiceWorkerHostMsg_TerminateWorker,
                      int /* handle_id */)
 
-// Asks the browser to retrieve client of the sender ServiceWorker.
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_GetClient,
-                    int /* request_id */,
-                    std::string /* client_uuid */)
-
 // Sends MessageEvent to a client (renderer->browser).
 IPC_MESSAGE_ROUTED3(
     ServiceWorkerHostMsg_PostMessageToClient,
@@ -170,11 +165,6 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ServiceWorkerStateChanged,
 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_DidSkipWaiting,
                      int /* request_id */)
 
-// Sent via EmbeddedWorker as a response of GetClient.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DidGetClient,
-                     int /* request_id */,
-                     blink::mojom::ServiceWorkerClientInfo)
-
 // Sent via EmbeddedWorker as a response of OpenWindow.
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_OpenWindowResponse,
                      int /* request_id */,

content/renderer/service_worker/service_worker_context_client.cc

@@ -450,6 +450,17 @@ void DidClaimClients(
   callbacks->OnSuccess();
 }
 
+void DidGetClient(
+    std::unique_ptr<blink::WebServiceWorkerClientCallbacks> callbacks,
+    blink::mojom::ServiceWorkerClientInfoPtr client) {
+  std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client;
+  if (!client->client_uuid.empty()) {
+    web_client = std::make_unique<blink::WebServiceWorkerClientInfo>(
+        ToWebServiceWorkerClientInfo(std::move(client)));
+  }
+  callbacks->OnSuccess(std::move(web_client));
+}
+
 }  // namespace
 
 // Holding data that needs to be bound to the worker context on the
@@ -757,7 +768,6 @@ void ServiceWorkerContextClient::OnMessageReceived(
   CHECK_EQ(embedded_worker_id_, embedded_worker_id);
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerContextClient, message)
-    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClient, OnDidGetClient)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse,
                         OnOpenWindowResponse)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError,
@@ -778,9 +788,9 @@ void ServiceWorkerContextClient::GetClient(
     const blink::WebString& id,
     std::unique_ptr<blink::WebServiceWorkerClientCallbacks> callbacks) {
   DCHECK(callbacks);
-  int request_id = context_->client_callbacks.Add(std::move(callbacks));
-  Send(new ServiceWorkerHostMsg_GetClient(GetRoutingID(), request_id,
-                                          id.Utf8()));
+  (*context_->service_worker_host)
+      ->GetClient(id.Utf8(), WrapCallbackThreadSafe(base::BindOnce(
+                                 &DidGetClient, std::move(callbacks))));
 }
 
 void ServiceWorkerContextClient::GetClients(
@@ -1693,25 +1703,6 @@ void ServiceWorkerContextClient::DispatchPushEvent(
   proxy_->DispatchPushEvent(request_id, data);
 }
 
-void ServiceWorkerContextClient::OnDidGetClient(
-    int request_id,
-    const blink::mojom::ServiceWorkerClientInfo& client) {
-  TRACE_EVENT0("ServiceWorker", "ServiceWorkerContextClient::OnDidGetClient");
-  blink::WebServiceWorkerClientCallbacks* callbacks =
-      context_->client_callbacks.Lookup(request_id);
-  if (!callbacks) {
-    NOTREACHED() << "Got stray response: " << request_id;
-    return;
-  }
-  std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client;
-  if (!client.client_uuid.empty()) {
-    web_client.reset(new blink::WebServiceWorkerClientInfo(
-        ToWebServiceWorkerClientInfo(client)));
-  }
-  callbacks->OnSuccess(std::move(web_client));
-  context_->client_callbacks.Remove(request_id);
-}
-
 void ServiceWorkerContextClient::OnOpenWindowResponse(
     int request_id,
     const blink::mojom::ServiceWorkerClientInfo& client) {

content/renderer/service_worker/service_worker_context_client.h

@@ -359,8 +359,6 @@ class CONTENT_EXPORT ServiceWorkerContextClient
       const std::string& notification_id,
       const PlatformNotificationData& notification_data);
 
-  void OnDidGetClient(int request_id,
-                      const blink::mojom::ServiceWorkerClientInfo& client);
   void OnOpenWindowResponse(
       int request_id,
       const blink::mojom::ServiceWorkerClientInfo& client);

third_party/WebKit/common/service_worker/service_worker.mojom

@@ -25,8 +25,11 @@ interface ServiceWorkerHost {
   GetClients(ServiceWorkerClientQueryOptions options)
     => (array<ServiceWorkerClientInfo> clients);
 
+  // Corresponds to Clients#get(id). Gets information of the service worker
+  // client with |client_uuid|.
+  GetClient(string client_uuid) => (ServiceWorkerClientInfo client);
+
   // TODO(leonhsl): Impl all methods.
-  // GetClient();
   // OpenNewTab();
   // OpenNewPopup();
   // PostMessageToClient();