HTML MessagePort as mojo::MessagePipeHandle

content/child/service_worker/web_service_worker_impl.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/child/service_worker/web_service_worker_impl.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 25 matching lines @@
   ~HandleImpl() override {}
 
   blink::WebServiceWorker* serviceWorker() override { return worker_.get(); }
 
  private:
   scoped_refptr<WebServiceWorkerImpl> worker_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleImpl);
 };
 
-void SendPostMessageToWorkerOnMainThread(
-    ThreadSafeSender* thread_safe_sender,
-    int handle_id,
-    int provider_id,
-    const base::string16& message,
-    const url::Origin& source_origin,
-    std::unique_ptr<WebMessagePortChannelArray> channels) {
+void SendPostMessageToWorkerOnMainThread(ThreadSafeSender* thread_safe_sender,
+                                         int handle_id,
+                                         int provider_id,
+                                         const base::string16& message,
+                                         const url::Origin& source_origin,
+                                         WebMessagePortChannelArray channels) {
   thread_safe_sender->Send(new ServiceWorkerHostMsg_PostMessageToWorker(
       handle_id, provider_id, message, source_origin,
-      WebMessagePortChannelImpl::ExtractMessagePortIDs(std::move(channels))));
+      WebMessagePortChannelImpl::ExtractMessagePorts(std::move(channels))));
 }
 
 }  // namespace
 
 WebServiceWorkerImpl::WebServiceWorkerImpl(
     std::unique_ptr<ServiceWorkerHandleReference> handle_ref,
     ThreadSafeSender* thread_safe_sender)
     : handle_ref_(std::move(handle_ref)),
       state_(handle_ref_->state()),
       thread_safe_sender_(thread_safe_sender),
@@ skipping 28 matching lines @@
 }
 
 blink::WebServiceWorkerState WebServiceWorkerImpl::state() const {
   return state_;
 }
 
 void WebServiceWorkerImpl::postMessage(
     blink::WebServiceWorkerProvider* provider,
     const WebString& message,
     const WebSecurityOrigin& source_origin,
-    WebMessagePortChannelArray* channels) {
+    WebMessagePortChannelArray channels) {
   WebServiceWorkerProviderImpl* provider_impl =
       static_cast<WebServiceWorkerProviderImpl*>(provider);
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   DCHECK(dispatcher);
 
   // 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.
   dispatcher->main_thread_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&SendPostMessageToWorkerOnMainThread,
                  base::RetainedRef(thread_safe_sender_),
                  handle_ref_->handle_id(), provider_impl->provider_id(),
                  // We convert WebString to string16 before crossing
                  // threads for thread-safety.
                  message.utf16(), url::Origin(source_origin),
-                 base::Passed(base::WrapUnique(channels))));
+                 base::Passed(&channels)));

[kinuko, 2017/02/09 06:21:30]

I think we could remove this PostTask too?  Could you try that too or have a
TODO comment for us?

 }
 
 void WebServiceWorkerImpl::terminate() {
   thread_safe_sender_->Send(
       new ServiceWorkerHostMsg_TerminateWorker(handle_ref_->handle_id()));
 }
 
 // static
 std::unique_ptr<blink::WebServiceWorker::Handle>
 WebServiceWorkerImpl::CreateHandle(
     const scoped_refptr<WebServiceWorkerImpl>& worker) {
   if (!worker)
     return nullptr;
   return base::MakeUnique<HandleImpl>(worker);
 }
 
 WebServiceWorkerImpl::~WebServiceWorkerImpl() {
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   if (dispatcher)
     dispatcher->RemoveServiceWorker(handle_ref_->handle_id());
 }
 
 }  // namespace content