| Index: media/base/text_renderer.h
|
| diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h
|
| index 2888daf431c2a75bea8d368bcb22710deb13b84c..ab1867df75a7e53faf3cb4cf539309a883c31175 100644
|
| --- a/media/base/text_renderer.h
|
| +++ b/media/base/text_renderer.h
|
| @@ -6,11 +6,11 @@
|
| #define MEDIA_BASE_TEXT_RENDERER_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/media_export.h"
|
| @@ -76,11 +76,11 @@ class MEDIA_EXPORT TextRenderer {
|
| kReadPending
|
| };
|
|
|
| - explicit TextTrackState(scoped_ptr<TextTrack> text_track);
|
| + explicit TextTrackState(std::unique_ptr<TextTrack> text_track);
|
| ~TextTrackState();
|
|
|
| ReadState read_state;
|
| - scoped_ptr<TextTrack> text_track;
|
| + std::unique_ptr<TextTrack> text_track;
|
| TextRanges text_ranges_;
|
| };
|
|
|
| @@ -97,7 +97,7 @@ class MEDIA_EXPORT TextRenderer {
|
| // Dispatched when the AddTextTrackCB completes, after having created
|
| // the TextTrack object associated with |text_stream|.
|
| void OnAddTextTrackDone(DemuxerStream* text_stream,
|
| - scoped_ptr<TextTrack> text_track);
|
| + std::unique_ptr<TextTrack> text_track);
|
|
|
| // Utility function to post a read request on |text_stream|.
|
| void Read(TextTrackState* state, DemuxerStream* text_stream);
|
|
|