Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h

Index: third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
index 38d68f668667652583b3cb409501414ea763997f..ebc1852c9db560eacd8ace85fbe31f438b4766c7 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h
@@ -36,10 +36,11 @@
 #include "platform/audio/AudioDestinationConsumer.h"
 #include "public/platform/WebMediaConstraints.h"
 #include "wtf/Allocator.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 namespace blink {
 
@@ -81,7 +82,7 @@ public:
     void addObserver(Observer*);
 
     ExtraData* getExtraData() const { return m_extraData.get(); }
-    void setExtraData(std::unique_ptr<ExtraData> extraData) { m_extraData = std::move(extraData); }
+    void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move(extraData); }
 
     void setConstraints(WebMediaConstraints constraints) { m_constraints = constraints; }
     WebMediaConstraints constraints() { return m_constraints; }
@@ -111,7 +112,7 @@ private:
     HeapHashSet<WeakMember<Observer>> m_observers;
     Mutex m_audioConsumersLock;
     HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers;
-    std::unique_ptr<ExtraData> m_extraData;
+    OwnPtr<ExtraData> m_extraData;
     WebMediaConstraints m_constraints;
 };