Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

 /*
  * Copyright (C) 2013 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 12 matching lines @@
  */
 
 #include "public/platform/WebMediaStreamTrack.h"
 
 #include "platform/mediastream/MediaStreamComponent.h"
 #include "platform/mediastream/MediaStreamSource.h"
 #include "public/platform/WebAudioSourceProvider.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamSource.h"
 #include "public/platform/WebString.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
     class TrackDataContainer : public MediaStreamComponent::TrackData {
     public:
-        explicit TrackDataContainer(std::unique_ptr<WebMediaStreamTrack::TrackData> extraData)
+        explicit TrackDataContainer(PassOwnPtr<WebMediaStreamTrack::TrackData> extraData)
             : m_extraData(std::move(extraData))
         {
         }
 
         WebMediaStreamTrack::TrackData* getTrackData() { return m_extraData.get(); }
         void getSettings(WebMediaStreamTrack::Settings& settings)
         {
             m_extraData->getSettings(settings);
         }
 
     private:
-        std::unique_ptr<WebMediaStreamTrack::TrackData> m_extraData;
+        OwnPtr<WebMediaStreamTrack::TrackData> m_extraData;
 };
 
 } // namespace
 
 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamComponent)
     : m_private(mediaStreamComponent)
 {
 }
 
 WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaStreamComponent)
@@ skipping 51 matching lines @@
     MediaStreamComponent::TrackData* data = m_private->getTrackData();
     if (!data)
         return 0;
     return static_cast<TrackDataContainer*>(data)->getTrackData();
 }
 
 void WebMediaStreamTrack::setTrackData(TrackData* extraData)
 {
     ASSERT(!m_private.isNull());
 
-    m_private->setTrackData(wrapUnique(new TrackDataContainer(wrapUnique(extraData))));
+    m_private->setTrackData(adoptPtr(new TrackDataContainer(adoptPtr(extraData))));
 }
 
 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
 {    ASSERT(!m_private.isNull());
     m_private->setSourceProvider(provider);
 }
 
 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
 {
     m_private = other.m_private;
 }
 
 } // namespace blink