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

content/browser/service_worker/service_worker_version.cc

 // Copyright 2013 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/browser/service_worker/service_worker_version.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
@@ skipping 1229 matching lines @@
       controllee_by_id_.Lookup(client_id);
   if (!provider_host) {
     // The client may already have been closed, just ignore.
     return;
   }
   provider_host->PostMessage(message, sent_message_port_ids);
 }
 
 void ServiceWorkerVersion::OnFocusClient(int request_id, int client_id) {
   TRACE_EVENT2("ServiceWorker",
-               "ServiceWorkerVersion::OnFocusDocument",
+               "ServiceWorkerVersion::OnFocusClient",
                "Request id", request_id,
                "Client id", client_id);
   ServiceWorkerProviderHost* provider_host =
       controllee_by_id_.Lookup(client_id);
   if (!provider_host) {
     // The client may already have been closed, just ignore.
     return;
   }
 
   provider_host->Focus(
       base::Bind(&ServiceWorkerVersion::OnFocusClientFinished,
                  weak_factory_.GetWeakPtr(),
-                 request_id));
+                 request_id,
+                 client_id));
 }
 
-void ServiceWorkerVersion::OnFocusClientFinished(int request_id, bool result) {
+void ServiceWorkerVersion::OnFocusClientFinished(
+    int request_id,
+    int cliend_id,
+    const ServiceWorkerClientInfo& client) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (running_status() != RUNNING)
     return;
 
+  ServiceWorkerClientInfo client_info(client);
+  client_info.client_id = cliend_id;
+
   embedded_worker_->SendMessage(ServiceWorkerMsg_FocusClientResponse(
-      request_id, result));
+      request_id, client_info));
 }
 
 void ServiceWorkerVersion::OnSkipWaiting(int request_id) {
   skip_waiting_ = true;
   if (status_ != INSTALLED)
     return DidSkipWaiting(request_id);
 
   if (!context_)
     return;
   ServiceWorkerRegistration* registration =
@@ skipping 126 matching lines @@
     int request_id) {
   callbacks->Remove(request_id);
   if (is_doomed_) {
     // The stop should be already scheduled, but try to stop immediately, in
     // order to release worker resources soon.
     StopWorkerIfIdle();
   }
 }
 
 }  // namespace content