Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp

 // Copyright 2015 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 "modules/compositorworker/CompositorWorkerGlobalScope.h"
 
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "core/workers/InProcessWorkerObjectProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/EventTargetModules.h"
 #include "modules/compositorworker/CompositorWorkerThread.h"
-#include <memory>
 
 namespace blink {
 
-CompositorWorkerGlobalScope* CompositorWorkerGlobalScope::create(CompositorWorkerThread* thread, std::unique_ptr<WorkerThreadStartupData> startupData, double timeOrigin)
+CompositorWorkerGlobalScope* CompositorWorkerGlobalScope::create(CompositorWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin)
 {
     // Note: startupData is finalized on return. After the relevant parts has been
     // passed along to the created 'context'.
     CompositorWorkerGlobalScope* context = new CompositorWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, thread, timeOrigin, std::move(startupData->m_starterOriginPrivilegeData), startupData->m_workerClients.release());
     context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);
     context->setAddressSpace(startupData->m_addressSpace);
     return context;
 }
 
-CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerThread* thread, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, WorkerClients* workerClients)
+CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, WorkerClients* workerClients)
     : WorkerGlobalScope(url, userAgent, thread, timeOrigin, std::move(starterOriginPrivilegeData), workerClients)
     , m_executingAnimationFrameCallbacks(false)
     , m_callbackCollection(this)
 {
     CompositorProxyClient::from(clients())->setGlobalScope(this);
 }
 
 CompositorWorkerGlobalScope::~CompositorWorkerGlobalScope()
 {
 }
 
 DEFINE_TRACE(CompositorWorkerGlobalScope)
 {
     visitor->trace(m_callbackCollection);
     WorkerGlobalScope::trace(visitor);
 }
 
 const AtomicString& CompositorWorkerGlobalScope::interfaceName() const
 {
     return EventTargetNames::CompositorWorkerGlobalScope;
 }
 
 void CompositorWorkerGlobalScope::postMessage(ExecutionContext* executionContext, PassRefPtr<SerializedScriptValue> message, const MessagePortArray& ports, ExceptionState& exceptionState)
 {
     // Disentangle the port in preparation for sending it to the remote context.
-    std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(executionContext, ports, exceptionState);
+    OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(executionContext, ports, exceptionState);
     if (exceptionState.hadException())
         return;
     thread()->workerObjectProxy().postMessageToWorkerObject(message, std::move(channels));
 }
 
 int CompositorWorkerGlobalScope::requestAnimationFrame(FrameRequestCallback* callback)
 {
     const bool shouldSignal = !m_executingAnimationFrameCallbacks && m_callbackCollection.isEmpty();
     if (shouldSignal)
         CompositorProxyClient::from(clients())->requestAnimationFrame();
@@ skipping 11 matching lines @@
     m_callbackCollection.executeCallbacks(highResTimeMs, highResTimeMs);
     return !m_callbackCollection.isEmpty();
 }
 
 CompositorWorkerThread* CompositorWorkerGlobalScope::thread() const
 {
     return static_cast<CompositorWorkerThread*>(WorkerGlobalScope::thread());
 }
 
 } // namespace blink