Index: third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp |
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp |
index 59996c8b01ffa4cf8faff8865f807d09b7ccd33f..be39614ee4783000eceb28964a1748a99b6209f6 100644 |
--- a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp |
+++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp |
@@ -35,8 +35,9 @@ |
#include "public/platform/WebAudioDestinationConsumer.h" |
#include "public/platform/WebMediaConstraints.h" |
#include "public/platform/WebString.h" |
-#include "wtf/PassOwnPtr.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/Vector.h" |
+#include <memory> |
namespace blink { |
@@ -44,12 +45,12 @@ namespace { |
class ExtraDataContainer : public MediaStreamSource::ExtraData { |
public: |
- ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) : m_extraData(std::move(extraData)) { } |
+ ExtraDataContainer(std::unique_ptr<WebMediaStreamSource::ExtraData> extraData) : m_extraData(std::move(extraData)) { } |
WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); } |
private: |
- OwnPtr<WebMediaStreamSource::ExtraData> m_extraData; |
+ std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData; |
}; |
} // namespace |
@@ -154,7 +155,7 @@ void WebMediaStreamSource::setExtraData(ExtraData* extraData) |
if (extraData) |
extraData->setOwner(m_private.get()); |
- m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)))); |
+ m_private->setExtraData(wrapUnique(new ExtraDataContainer(wrapUnique(extraData)))); |
} |
WebMediaConstraints WebMediaStreamSource::constraints() |