Revert "Remove OwnPtr from Blink."

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

Index: third_party/WebKit/Source/platform/exported/WebMediaStream.cpp
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp
index 957389727a29098384270040c10a8047b1f2da75..468f919898e5eae51026ce97ce1ef3dbfc03112a 100644
--- a/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebMediaStream.cpp
@@ -31,9 +31,9 @@
 #include "public/platform/WebMediaStreamSource.h"
 #include "public/platform/WebMediaStreamTrack.h"
 #include "public/platform/WebString.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 namespace blink {
 
@@ -41,12 +41,12 @@ namespace {
 
 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
 public:
-    ExtraDataContainer(std::unique_ptr<WebMediaStream::ExtraData> extraData) : m_extraData(std::move(extraData)) { }
+    ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extraData(std::move(extraData)) { }
 
     WebMediaStream::ExtraData* getExtraData() { return m_extraData.get(); }
 
 private:
-    std::unique_ptr<WebMediaStream::ExtraData> m_extraData;
+    OwnPtr<WebMediaStream::ExtraData> m_extraData;
 };
 
 } // namespace
@@ -76,7 +76,7 @@ WebMediaStream::ExtraData* WebMediaStream::getExtraData() const
 
 void WebMediaStream::setExtraData(ExtraData* extraData)
 {
-    m_private->setExtraData(wrapUnique(new ExtraDataContainer(wrapUnique(extraData))));
+    m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))));
 }
 
 void WebMediaStream::audioTracks(WebVector<WebMediaStreamTrack>& webTracks) const