HTML MessagePort as mojo::MessagePipeHandle

third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
index f3eeaf72b214a424a60efe2d49fc6fc6f4ce84b7..bdaeb254321373857e96dc77df3421d4bdad3074 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -62,7 +62,7 @@ void ServiceWorker::postMessage(ExecutionContext* context,
   }
 
   // Disentangle the port in preparation for sending it to the remote context.
-  std::unique_ptr<MessagePortChannelArray> channels =
+  MessagePortChannelArray channels =
       MessagePort::disentanglePorts(context, ports, exceptionState);
   if (exceptionState.hadException())
     return;
@@ -73,12 +73,12 @@ void ServiceWorker::postMessage(ExecutionContext* context,
   }
 
   WebString messageString = message->toWireString();
-  std::unique_ptr<WebMessagePortChannelArray> webChannels =
+  WebMessagePortChannelArray webChannels =
       MessagePort::toWebMessagePortChannelArray(std::move(channels));
   m_handle->serviceWorker()->postMessage(
       client->provider(), messageString,
       WebSecurityOrigin(getExecutionContext()->getSecurityOrigin()),
-      webChannels.release());
+      std::move(webChannels));
 }
 
 void ServiceWorker::internalsTerminate() {