| Index: media/formats/mp4/track_run_iterator.h
|
| diff --git a/media/formats/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h
|
| index 4903f7645d45b5a36906ce51e8b89b0889be3d43..a04f2becb5c0f44b6d35f37524a3cbd49e7d6deb 100644
|
| --- a/media/formats/mp4/track_run_iterator.h
|
| +++ b/media/formats/mp4/track_run_iterator.h
|
| @@ -8,10 +8,10 @@
|
| #include <stddef.h>
|
| #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/media_export.h"
|
| #include "media/base/media_log.h"
|
| @@ -87,7 +87,7 @@ class MEDIA_EXPORT TrackRunIterator {
|
|
|
| // Only call when is_encrypted() is true and AuxInfoNeedsToBeCached() is
|
| // false. Result is owned by caller.
|
| - scoped_ptr<DecryptConfig> GetDecryptConfig();
|
| + std::unique_ptr<DecryptConfig> GetDecryptConfig();
|
|
|
| private:
|
| void ResetRun();
|
|
|