Index: third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h |
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h |
index 87d2167e45b5f36694eb733d2c75cd715c3afc23..7c5f40600fa153642ac193b4d1b0cc034fde3b6e 100644 |
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h |
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h |
@@ -38,7 +38,6 @@ |
#include "wtf/Forward.h" |
#include "wtf/ThreadingPrimitives.h" |
#include "wtf/text/WTFString.h" |
-#include <memory> |
namespace blink { |
@@ -79,7 +78,7 @@ public: |
void setSourceProvider(WebAudioSourceProvider* provider) { m_sourceProvider.wrap(provider); } |
TrackData* getTrackData() const { return m_trackData.get(); } |
- void setTrackData(std::unique_ptr<TrackData> trackData) { m_trackData = std::move(trackData); } |
+ void setTrackData(PassOwnPtr<TrackData> trackData) { m_trackData = std::move(trackData); } |
void getSettings(WebMediaStreamTrack::Settings&); |
DECLARE_TRACE(); |
@@ -115,7 +114,7 @@ private: |
String m_id; |
bool m_enabled; |
bool m_muted; |
- std::unique_ptr<TrackData> m_trackData; |
+ OwnPtr<TrackData> m_trackData; |
}; |
typedef HeapVector<Member<MediaStreamComponent>> MediaStreamComponentVector; |