HTML MessagePort as mojo::MessagePipeHandle

content/child/service_worker/web_service_worker_impl.cc

Index: content/child/service_worker/web_service_worker_impl.cc
diff --git a/content/child/service_worker/web_service_worker_impl.cc b/content/child/service_worker/web_service_worker_impl.cc
index 947359eb70a9e7f794c2934d61a3ffa0a60af94c..5583ecd1943078292012813f273227c81fd3565b 100644
--- a/content/child/service_worker/web_service_worker_impl.cc
+++ b/content/child/service_worker/web_service_worker_impl.cc
@@ -43,16 +43,15 @@ class HandleImpl : public blink::WebServiceWorker::Handle {
   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
@@ -101,7 +100,7 @@ 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 =
@@ -120,7 +119,7 @@ void WebServiceWorkerImpl::postMessage(
                  // 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)));
 }
 
 void WebServiceWorkerImpl::terminate() {