Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/presentation/PresentationController.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/presentation/PresentationController.h"
 
 #include "core/frame/LocalFrame.h"
 #include "modules/presentation/PresentationConnection.h"
 #include "public/platform/modules/presentation/WebPresentationClient.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 PresentationController::PresentationController(LocalFrame& frame, WebPresentationClient* client)
     : LocalFrameLifecycleObserver(&frame)
     , m_client(client)
 {
     if (m_client)
         m_client->setController(this);
 }
@@ skipping 38 matching lines @@
     visitor->trace(m_presentation);
     visitor->trace(m_connections);
     Supplement<LocalFrame>::trace(visitor);
     LocalFrameLifecycleObserver::trace(visitor);
 }
 
 void PresentationController::didStartDefaultSession(WebPresentationConnectionClient* connectionClient)
 {
     if (!m_presentation || !m_presentation->defaultRequest())
         return;
-    PresentationConnection::take(this, wrapUnique(connectionClient), m_presentation->defaultRequest());
+    PresentationConnection::take(this, adoptPtr(connectionClient), m_presentation->defaultRequest());
 }
 
 void PresentationController::didChangeSessionState(WebPresentationConnectionClient* connectionClient, WebPresentationConnectionState state)
 {
-    std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+    OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
 
     PresentationConnection* connection = findConnection(client.get());
     if (!connection)
         return;
     connection->didChangeState(state);
 }
 
 void PresentationController::didCloseConnection(WebPresentationConnectionClient* connectionClient, WebPresentationConnectionCloseReason reason, const WebString& message)
 {
-    std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+    OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
 
     PresentationConnection* connection = findConnection(client.get());
     if (!connection)
         return;
     connection->didClose(reason, message);
 }
 
 void PresentationController::didReceiveSessionTextMessage(WebPresentationConnectionClient* connectionClient, const WebString& message)
 {
-    std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+    OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
 
     PresentationConnection* connection = findConnection(client.get());
     if (!connection)
         return;
     connection->didReceiveTextMessage(message);
 }
 
 void PresentationController::didReceiveSessionBinaryMessage(WebPresentationConnectionClient* connectionClient, const uint8_t* data, size_t length)
 {
-    std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+    OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
 
     PresentationConnection* connection = findConnection(client.get());
     if (!connection)
         return;
     connection->didReceiveBinaryMessage(data, length);
 }
 
 void PresentationController::setPresentation(Presentation* presentation)
 {
     m_presentation = presentation;
@@ skipping 27 matching lines @@
 {
     for (const auto& connection : m_connections) {
         if (connection->matches(connectionClient))
             return connection.get();
     }
 
     return nullptr;
 }
 
 } // namespace blink