| Index: media/formats/webm/webm_content_encodings_client.h
|
| diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h
|
| index 41cb7c04ebd71b8e7ac7af5524e7851ab1f0a209..09dfcf0fac1ae3392653797b934d928f2382efe1 100644
|
| --- a/media/formats/webm/webm_content_encodings_client.h
|
| +++ b/media/formats/webm/webm_content_encodings_client.h
|
| @@ -7,12 +7,12 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/media_log.h"
|
| #include "media/formats/webm/webm_content_encodings.h"
|
| @@ -38,7 +38,7 @@ class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {
|
|
|
| private:
|
| scoped_refptr<MediaLog> media_log_;
|
| - scoped_ptr<ContentEncoding> cur_content_encoding_;
|
| + std::unique_ptr<ContentEncoding> cur_content_encoding_;
|
| bool content_encryption_encountered_;
|
| ContentEncodings content_encodings_;
|
|
|
|
|