Index: media/base/stream_parser.h |
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h |
index fed228c50c2d087e01b2c68b4f0fce15a30be757..58e1b7b9daad67d1cb0295aa33b6a818dc256d98 100644 |
--- a/media/base/stream_parser.h |
+++ b/media/base/stream_parser.h |
@@ -10,13 +10,13 @@ |
#include <deque> |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/callback_forward.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "media/base/demuxer_stream.h" |
#include "media/base/eme_constants.h" |
@@ -89,7 +89,7 @@ class MEDIA_EXPORT StreamParser { |
// Return value - True if the new configurations are accepted. |
// False if the new configurations are not supported |
// and indicates that a parsing error should be signalled. |
- typedef base::Callback<bool(scoped_ptr<MediaTracks>, |
+ typedef base::Callback<bool(std::unique_ptr<MediaTracks>, |
dcheng
2016/04/23 00:57:23
using if you're feeling so inclined
danakj
2016/04/23 01:11:15
Done.
|
const TextTrackConfigMap&)> |
NewConfigCB; |