Index: media/base/media_tracks.h |
diff --git a/media/base/media_tracks.h b/media/base/media_tracks.h |
index 4e0fbb0fc1f88195ce14cc05d14a424924be4d5d..7ff4b2d10acd69c25e421f264becdf10884b6a9a 100644 |
--- a/media/base/media_tracks.h |
+++ b/media/base/media_tracks.h |
@@ -6,11 +6,11 @@ |
#define MEDIA_BASE_MEDIA_TRACKS_H_ |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "media/base/media_export.h" |
#include "media/base/media_track.h" |
@@ -21,7 +21,7 @@ class VideoDecoderConfig; |
class MEDIA_EXPORT MediaTracks { |
public: |
- typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection; |
+ typedef std::vector<std::unique_ptr<MediaTrack>> MediaTracksCollection; |
dcheng
2016/04/23 00:57:23
using? =D
danakj
2016/04/23 01:11:15
Done.
|
MediaTracks(); |
~MediaTracks(); |