Use UUID for ServiceWorker Client identifier (2/3, chromium)

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/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/message_port_messages.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/public/common/referrer.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebCrossOriginServiceWorkerClient.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientQueryOptions.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
 
 namespace content {
 
 namespace {
 
-void SendPostMessageToDocumentOnMainThread(
+void SendPostMessageToClientOnMainThread(
     ThreadSafeSender* sender,
     int routing_id,
-    int client_id,
+    const std::string& uuid,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
-  sender->Send(new ServiceWorkerHostMsg_PostMessageToDocument(
-      routing_id, client_id, message,
+  sender->Send(new ServiceWorkerHostMsg_PostMessageToClient(
+      routing_id, uuid, message,
       WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release())));
 }
 
 void SendCrossOriginMessageToClientOnMainThread(
     ThreadSafeSender* sender,
     int message_port_id,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   sender->Send(new MessagePortHostMsg_PostMessage(
       message_port_id,
@@ skipping 23 matching lines @@
     RequestContextFrameType frame_type) {
   return static_cast<blink::WebURLRequest::FrameType>(frame_type);
 }
 
 blink::WebServiceWorkerClientInfo
 ToWebServiceWorkerClientInfo(const ServiceWorkerClientInfo& client_info) {
   DCHECK(client_info.IsValid());
 
   blink::WebServiceWorkerClientInfo web_client_info;
 
-  web_client_info.clientID = client_info.client_id;
+  web_client_info.uuid = base::UTF8ToUTF16(client_info.client_uuid);
   web_client_info.pageVisibilityState = client_info.page_visibility_state;
   web_client_info.isFocused = client_info.is_focused;
   web_client_info.url = client_info.url;
   web_client_info.frameType = GetBlinkFrameType(client_info.frame_type);
   web_client_info.clientType = client_info.client_type;
 
   return web_client_info;
 }
 
 }  // namespace
@@ skipping 151 matching lines @@
                                                    const char* data,
                                                    size_t size) {
   std::vector<char> copy(data, data + size);
   Send(new ServiceWorkerHostMsg_SetCachedMetadata(GetRoutingID(), url, copy));
 }
 
 void ServiceWorkerScriptContext::ClearCachedMetadata(const GURL& url) {
   Send(new ServiceWorkerHostMsg_ClearCachedMetadata(GetRoutingID(), url));
 }
 
-void ServiceWorkerScriptContext::PostMessageToDocument(
-    int client_id,
+void ServiceWorkerScriptContext::PostMessageToClient(
+    const base::string16& uuid,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   // This may send channels for MessagePorts, and all internal book-keeping
   // messages for MessagePort (e.g. QueueMessages) are sent from main thread
   // (with thread hopping), so we need to do the same thread hopping here not
   // to overtake those messages.
   embedded_context_->main_thread_task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&SendPostMessageToDocumentOnMainThread,
+      base::Bind(&SendPostMessageToClientOnMainThread,
                  make_scoped_refptr(embedded_context_->thread_safe_sender()),
-                 GetRoutingID(), client_id, message, base::Passed(&channels)));
+                 GetRoutingID(),
+                 base::UTF16ToUTF8(uuid),
+                 message, base::Passed(&channels)));
 }
 
 void ServiceWorkerScriptContext::PostCrossOriginMessageToClient(
     const blink::WebCrossOriginServiceWorkerClient& client,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   // This may send channels for MessagePorts, and all internal book-keeping
   // messages for MessagePort (e.g. QueueMessages) are sent from main thread
   // (with thread hopping), so we need to do the same thread hopping here not
   // to overtake those messages.
   embedded_context_->main_thread_task_runner()->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::WebServiceWorkerClientCallbacks* callback) {
+    const base::string16& uuid,
+    blink::WebServiceWorkerClientCallbacks* callback) {
   DCHECK(callback);
   int request_id = pending_client_callbacks_.Add(callback);
-  Send(new ServiceWorkerHostMsg_FocusClient(
-      GetRoutingID(), request_id, client_id));
+  Send(new ServiceWorkerHostMsg_FocusClient(GetRoutingID(), request_id,
+                                            base::UTF16ToUTF8(uuid)));
 }
 
 void ServiceWorkerScriptContext::ClaimClients(
     blink::WebServiceWorkerClientsClaimCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_claim_clients_callbacks_.Add(callbacks);
   Send(new ServiceWorkerHostMsg_ClaimClients(GetRoutingID(), request_id));
 }
 
 void ServiceWorkerScriptContext::SkipWaiting(
@@ skipping 276 matching lines @@
       new blink::WebServiceWorkerError(error_type, message));
   callbacks->onError(error.release());
   pending_claim_clients_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerScriptContext::OnPing() {
   Send(new ServiceWorkerHostMsg_Pong(GetRoutingID()));
 }
 
 }  // namespace content