Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.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/audio_output_devices/HTMLMediaElementAudioOutputDevice.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
 #include "modules/audio_output_devices/SetSinkIdCallbacks.h"
 #include "public/platform/WebSecurityOrigin.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 class SetSinkIdResolver : public ScriptPromiseResolver {
     WTF_MAKE_NONCOPYABLE(SetSinkIdResolver);
 public:
     static SetSinkIdResolver* create(ScriptState*, HTMLMediaElement&, const String& sinkId);
     ~SetSinkIdResolver() override = default;
@@ skipping 28 matching lines @@
 
 void SetSinkIdResolver::startAsync()
 {
     m_timer.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void SetSinkIdResolver::timerFired(Timer<SetSinkIdResolver>* timer)
 {
     ExecutionContext* context = getExecutionContext();
     ASSERT(context && context->isDocument());
-    std::unique_ptr<SetSinkIdCallbacks> callbacks = wrapUnique(new SetSinkIdCallbacks(this, *m_element, m_sinkId));
+    OwnPtr<SetSinkIdCallbacks> callbacks = adoptPtr(new SetSinkIdCallbacks(this, *m_element, m_sinkId));
     WebMediaPlayer* webMediaPlayer = m_element->webMediaPlayer();
     if (webMediaPlayer) {
-        // Using release() to transfer ownership because |webMediaPlayer| is a platform object that takes raw pointers
-        webMediaPlayer->setSinkId(m_sinkId, WebSecurityOrigin(context->getSecurityOrigin()), callbacks.release());
+        // Using leakPtr() to transfer ownership because |webMediaPlayer| is a platform object that takes raw pointers
+        webMediaPlayer->setSinkId(m_sinkId, WebSecurityOrigin(context->getSecurityOrigin()), callbacks.leakPtr());
     } else {
         if (AudioOutputDeviceClient* client = AudioOutputDeviceClient::from(context)) {
             client->checkIfAudioSinkExistsAndIsAuthorized(context, m_sinkId, std::move(callbacks));
         } else {
             // The context has been detached. Impossible to get a security origin to check.
             ASSERT(context->activeDOMObjectsAreStopped());
             reject(DOMException::create(SecurityError, "Impossible to authorize device for detached context"));
         }
     }
 }
@@ skipping 48 matching lines @@
     }
     return *supplement;
 }
 
 DEFINE_TRACE(HTMLMediaElementAudioOutputDevice)
 {
     Supplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink