[ServiceWorker] Update SWProviderHost::Focus() to return a Client.

content/renderer/service_worker/service_worker_script_context.cc

 // Copyright 2014 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.
 
 #include "content/renderer/service_worker/service_worker_script_context.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/notifications/notification_data_conversions.h"
@@ skipping 246 matching lines @@
   // (with thread hopping), so we need to do the same thread hopping here not
   // to overtake those messages.
   embedded_context_->main_thread_proxy()->PostTask(
       FROM_HERE,
       base::Bind(&SendCrossOriginMessageToClientOnMainThread,
                  make_scoped_refptr(embedded_context_->thread_safe_sender()),
                  client.clientID, message, base::Passed(&channels)));
 }
 
 void ServiceWorkerScriptContext::FocusClient(
-    int client_id, blink::WebServiceWorkerClientFocusCallback* callback) {
+    int client_id, blink::WebServiceWorkerClientCallbacks* callback) {
   DCHECK(callback);
-  int request_id = pending_focus_client_callbacks_.Add(callback);
+  int request_id = pending_client_callbacks_.Add(callback);
   Send(new ServiceWorkerHostMsg_FocusClient(
       GetRoutingID(), request_id, client_id));
 }
 
 void ServiceWorkerScriptContext::ClaimClients(
     blink::WebServiceWorkerClientsClaimCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_claim_clients_callbacks_.Add(callbacks);
   Send(new ServiceWorkerHostMsg_ClaimClients(GetRoutingID(), request_id));
 }
@@ skipping 213 matching lines @@
     return;
   }
   scoped_ptr<blink::WebServiceWorkerError> error(
       new blink::WebServiceWorkerError(
           blink::WebServiceWorkerError::ErrorTypeUnknown,
           "Something went wrong while trying to open the window."));
   callbacks->onError(error.release());
   pending_client_callbacks_.Remove(request_id);
 }
 
-void ServiceWorkerScriptContext::OnFocusClientResponse(int request_id,
-                                                       bool result) {
+void ServiceWorkerScriptContext::OnFocusClientResponse(
+    int request_id, const ServiceWorkerClientInfo& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnFocusClientResponse");
-  blink::WebServiceWorkerClientFocusCallback* callback =
-      pending_focus_client_callbacks_.Lookup(request_id);
+  blink::WebServiceWorkerClientCallbacks* callback =
+      pending_client_callbacks_.Lookup(request_id);
   if (!callback) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
-  callback->onSuccess(&result);
-  pending_focus_client_callbacks_.Remove(request_id);
+  if (!client.IsEmpty()) {
+    DCHECK(client.IsValid());
+    scoped_ptr<blink::WebServiceWorkerClientInfo> web_client (
+        new blink::WebServiceWorkerClientInfo(
+            ToWebServiceWorkerClientInfo(client)));
+    callback->onSuccess(web_client.release());
+  } else {
+    scoped_ptr<blink::WebServiceWorkerError> error(
+        new blink::WebServiceWorkerError(
+            blink::WebServiceWorkerError::ErrorTypeNotFound,
+            "The WindowClient was not found."));
+    callback->onError(error.release());
+  }
+
+  pending_client_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerScriptContext::OnDidSkipWaiting(int request_id) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnDidSkipWaiting");
   blink::WebServiceWorkerSkipWaitingCallbacks* callbacks =
       pending_skip_waiting_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
@@ skipping 27 matching lines @@
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   scoped_ptr<blink::WebServiceWorkerError> error(
       new blink::WebServiceWorkerError(error_type, message));
   callbacks->onError(error.release());
   pending_claim_clients_callbacks_.Remove(request_id);
 }
 
 }  // namespace content