Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/audio/HRTFKernel.cpp

Index: third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
diff --git a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
index df21d791bc4915c0e37aa913e0b0d5440311019a..6ef5208b2248c88a2cc8c39f2bed5d15799ef1b4 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
@@ -26,13 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "platform/FloatConversion.h"
-#include "platform/audio/AudioChannel.h"
 #include "platform/audio/HRTFKernel.h"
+#include "platform/audio/AudioChannel.h"
+#include "platform/FloatConversion.h"
 #include "wtf/MathExtras.h"
-#include "wtf/PtrUtil.h"
 #include <algorithm>
-#include <memory>
 
 namespace blink {
 
@@ -88,13 +86,13 @@ HRTFKernel::HRTFKernel(AudioChannel* channel, size_t fftSize, float sampleRate)
         }
     }
 
-    m_fftFrame = wrapUnique(new FFTFrame(fftSize));
+    m_fftFrame = adoptPtr(new FFTFrame(fftSize));
     m_fftFrame->doPaddedFFT(impulseResponse, truncatedResponseLength);
 }
 
-std::unique_ptr<AudioChannel> HRTFKernel::createImpulseResponse()
+PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse()
 {
-    std::unique_ptr<AudioChannel> channel = wrapUnique(new AudioChannel(fftSize()));
+    OwnPtr<AudioChannel> channel = adoptPtr(new AudioChannel(fftSize()));
     FFTFrame fftFrame(*m_fftFrame);
 
     // Add leading delay back in.
@@ -105,7 +103,7 @@ std::unique_ptr<AudioChannel> HRTFKernel::createImpulseResponse()
 }
 
 // Interpolates two kernels with x: 0 -> 1 and returns the result.
-std::unique_ptr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x)
+PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x)
 {
     ASSERT(kernel1 && kernel2);
     if (!kernel1 || !kernel2)
@@ -122,7 +120,7 @@ std::unique_ptr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* ker
 
     float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay();
 
-    std::unique_ptr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kernel1->fftFrame(), *kernel2->fftFrame(), x);
+    OwnPtr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kernel1->fftFrame(), *kernel2->fftFrame(), x);
     return HRTFKernel::create(std::move(interpolatedFrame), frameDelay, sampleRate1);
 }