Revert "Remove OwnPtr from Blink."

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MessagePort.h"
 #include "core/events/Event.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/EventTargetModules.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerState.h"
-#include <memory>
 
 namespace blink {
 
 const AtomicString& ServiceWorker::interfaceName() const
 {
     return EventTargetNames::ServiceWorker;
 }
 
 void ServiceWorker::postMessage(ExecutionContext* context, PassRefPtr<SerializedScriptValue> message, const MessagePortArray& ports, ExceptionState& exceptionState)
 {
     ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(getExecutionContext());
     if (!client || !client->provider()) {
         exceptionState.throwDOMException(InvalidStateError, "Failed to post a message: No associated provider is available.");
         return;
     }
 
     // Disentangle the port in preparation for sending it to the remote context.
-    std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
+    OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
     if (exceptionState.hadException())
         return;
     if (m_handle->serviceWorker()->state() == WebServiceWorkerStateRedundant) {
         exceptionState.throwDOMException(InvalidStateError, "ServiceWorker is in redundant state.");
         return;
     }
 
     if (message->containsTransferableArrayBuffer())
         context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "ServiceWorker cannot send an ArrayBuffer as a transferable object yet. See http://crbug.com/511119"));
 
     WebString messageString = message->toWireString();
-    std::unique_ptr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePortChannelArray(std::move(channels));
-    m_handle->serviceWorker()->postMessage(client->provider(), messageString, WebSecurityOrigin(getExecutionContext()->getSecurityOrigin()), webChannels.release());
+    OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePortChannelArray(std::move(channels));
+    m_handle->serviceWorker()->postMessage(client->provider(), messageString, WebSecurityOrigin(getExecutionContext()->getSecurityOrigin()), webChannels.leakPtr());
 }
 
 void ServiceWorker::internalsTerminate()
 {
     m_handle->serviceWorker()->terminate();
 }
 
 void ServiceWorker::dispatchStateChangeEvent()
 {
     this->dispatchEvent(Event::create(EventTypeNames::statechange));
@@ skipping 20 matching lines @@
     case WebServiceWorkerStateActivated:
         return "activated";
     case WebServiceWorkerStateRedundant:
         return "redundant";
     default:
         ASSERT_NOT_REACHED();
         return nullAtom;
     }
 }
 
-ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, std::unique_ptr<WebServiceWorker::Handle> handle)
+ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
 {
     return getOrCreate(executionContext, std::move(handle));
 }
 
 bool ServiceWorker::hasPendingActivity() const
 {
     if (m_wasStopped)
         return false;
     return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant;
 }
 
 void ServiceWorker::stop()
 {
     m_wasStopped = true;
 }
 
-ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, std::unique_ptr<WebServiceWorker::Handle> handle)
+ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
 {
     if (!handle)
         return nullptr;
 
     ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceWorker()->proxy());
     if (existingWorker) {
         ASSERT(existingWorker->getExecutionContext() == executionContext);
         return existingWorker;
     }
 
     ServiceWorker* newWorker = new ServiceWorker(executionContext, std::move(handle));
     newWorker->suspendIfNeeded();
     return newWorker;
 }
 
-ServiceWorker::ServiceWorker(ExecutionContext* executionContext, std::unique_ptr<WebServiceWorker::Handle> handle)
+ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
     : AbstractWorker(executionContext)
     , ActiveScriptWrappable(this)
     , m_handle(std::move(handle))
     , m_wasStopped(false)
 {
     ASSERT(m_handle);
     m_handle->serviceWorker()->setProxy(this);
 }
 
 ServiceWorker::~ServiceWorker()
 {
 }
 
 DEFINE_TRACE(ServiceWorker)
 {
     AbstractWorker::trace(visitor);
 }
 
 } // namespace blink