Index: media/base/demuxer.h |
diff --git a/media/base/demuxer.h b/media/base/demuxer.h |
index 027264ba79fb916f0359a983d4f4dc4519ccba80..8b0fd1f753b84b42f15ec40ed0dfd221eff0d052 100644 |
--- a/media/base/demuxer.h |
+++ b/media/base/demuxer.h |
@@ -7,10 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "media/base/data_source.h" |
#include "media/base/demuxer_stream.h" |
@@ -69,7 +69,8 @@ class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider { |
// Notifies demuxer clients that media track configuration has been updated |
// (e.g. the inital stream metadata has been parsed successfully, or a new |
// init segment has been parsed successfully in MSE case). |
- typedef base::Callback<void(scoped_ptr<MediaTracks>)> MediaTracksUpdatedCB; |
+ typedef base::Callback<void(std::unique_ptr<MediaTracks>)> |
dcheng
2016/04/23 00:57:23
using if you're bored
danakj
2016/04/23 01:11:15
Done.
|
+ MediaTracksUpdatedCB; |
Demuxer(); |
~Demuxer() override; |