| Index: media/filters/stream_parser_factory.h
|
| diff --git a/media/filters/stream_parser_factory.h b/media/filters/stream_parser_factory.h
|
| index 3bbd58ab9bec2adb4585c0f21527e1c5da7630bb..d62115e31f4028f8bc17b6261b7d9af1f5ab21be 100644
|
| --- a/media/filters/stream_parser_factory.h
|
| +++ b/media/filters/stream_parser_factory.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef MEDIA_FILTERS_STREAM_PARSER_FACTORY_H_
|
| #define MEDIA_FILTERS_STREAM_PARSER_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/media_log.h"
|
|
|
| @@ -32,7 +32,7 @@ class MEDIA_EXPORT StreamParserFactory {
|
| // |has_video| is true if a video codec was specified.
|
| // Returns NULL otherwise. The values of |has_audio| and |has_video| are
|
| // undefined.
|
| - static scoped_ptr<StreamParser> Create(
|
| + static std::unique_ptr<StreamParser> Create(
|
| const std::string& type,
|
| const std::vector<std::string>& codecs,
|
| const scoped_refptr<MediaLog>& media_log,
|
|
|