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 824dce3d02fb6603bf68cb2305ba2d0e79f0ce8f..fc6672b356760fe949d42ae1093f073a5b1ac7a2 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -63,7 +63,7 @@ void ServiceWorker::postMessage(ScriptState* scriptState,
   }
 
   // Disentangle the port in preparation for sending it to the remote context.
-  std::unique_ptr<MessagePortChannelArray> channels =
+  MessagePortChannelArray channels =
       MessagePort::disentanglePorts(scriptState->getExecutionContext(), ports,
                                     exceptionState);
   if (exceptionState.hadException())
@@ -75,12 +75,12 @@ void ServiceWorker::postMessage(ScriptState* scriptState,
   }
 
   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() {