| Index: content/renderer/pepper/video_encoder_shim.h
|
| diff --git a/content/renderer/pepper/video_encoder_shim.h b/content/renderer/pepper/video_encoder_shim.h
|
| index 59b648adccd33b294123e54cc1d7d0a4524f6835..e48700b1d210a5655498f58fcdcefef351752c67 100644
|
| --- a/content/renderer/pepper/video_encoder_shim.h
|
| +++ b/content/renderer/pepper/video_encoder_shim.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/memory/weak_ptr.h"
|
| #include "media/video/video_encode_accelerator.h"
|
|
|
| @@ -63,7 +63,7 @@ class VideoEncoderShim : public media::VideoEncodeAccelerator {
|
| bool key_frame);
|
| void OnNotifyError(media::VideoEncodeAccelerator::Error error);
|
|
|
| - scoped_ptr<EncoderImpl> encoder_impl_;
|
| + std::unique_ptr<EncoderImpl> encoder_impl_;
|
|
|
| PepperVideoEncoderHost* host_;
|
|
|
|
|