Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

 /*
  * Copyright (C) 2012, 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:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webaudio/MediaStreamAudioSourceNode.h"
 
 #include "core/dom/ExceptionCode.h"
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/Logging.h"
 #include "wtf/Locker.h"
-#include <memory>
 
 namespace blink {
 
-MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)
+MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
     : AudioHandler(NodeTypeMediaStreamAudioSource, node, node.context()->sampleRate())
     , m_mediaStream(mediaStream)
     , m_audioTrack(audioTrack)
     , m_audioSourceProvider(std::move(audioSourceProvider))
     , m_sourceNumberOfChannels(0)
 {
     // Default to stereo. This could change depending on the format of the
     // MediaStream's audio track.
     addOutput(2);
 
     initialize();
 }
 
-PassRefPtr<MediaStreamAudioSourceHandler> MediaStreamAudioSourceHandler::create(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)
+PassRefPtr<MediaStreamAudioSourceHandler> MediaStreamAudioSourceHandler::create(AudioNode& node, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
 {
     return adoptRef(new MediaStreamAudioSourceHandler(node, mediaStream, audioTrack, std::move(audioSourceProvider)));
 }
 
 MediaStreamAudioSourceHandler::~MediaStreamAudioSourceHandler()
 {
     uninitialize();
 }
 
 void MediaStreamAudioSourceHandler::setFormat(size_t numberOfChannels, float sourceSampleRate)
@@ skipping 43 matching lines @@
     if (tryLocker.locked()) {
         getAudioSourceProvider()->provideInput(outputBus, numberOfFrames);
     } else {
         // We failed to acquire the lock.
         outputBus->zero();
     }
 }
 
 // ----------------------------------------------------------------
 
-MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, std::unique_ptr<AudioSourceProvider> audioSourceProvider)
+MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
     : AudioSourceNode(context)
 {
     setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTrack, std::move(audioSourceProvider)));
 }
 
 MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioContext& context, MediaStream& mediaStream, ExceptionState& exceptionState)
 {
     DCHECK(isMainThread());
 
     if (context.isContextClosed()) {
         context.throwExceptionForClosedState(exceptionState);
         return nullptr;
     }
 
     MediaStreamTrackVector audioTracks = mediaStream.getAudioTracks();
     if (audioTracks.isEmpty()) {
         exceptionState.throwDOMException(
             InvalidStateError,
             "MediaStream has no audio track");
         return nullptr;
     }
 
     // Use the first audio track in the media stream.
     MediaStreamTrack* audioTrack = audioTracks[0];
-    std::unique_ptr<AudioSourceProvider> provider = audioTrack->createWebAudioSource();
+    OwnPtr<AudioSourceProvider> provider = audioTrack->createWebAudioSource();
 
     MediaStreamAudioSourceNode* node = new MediaStreamAudioSourceNode(context, mediaStream, audioTrack, std::move(provider));
 
     if (!node)
         return nullptr;
 
     // TODO(hongchan): Only stereo streams are supported right now. We should be
     // able to accept multi-channel streams.
     node->setFormat(2, context.sampleRate());
     // context keeps reference until node is disconnected
@@ skipping 18 matching lines @@
     return mediaStreamAudioSourceHandler().getMediaStream();
 }
 
 void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float sourceSampleRate)
 {
     mediaStreamAudioSourceHandler().setFormat(numberOfChannels, sourceSampleRate);
 }
 
 } // namespace blink