| Index: remoting/client/plugin/pepper_video_renderer_2d.h
|
| diff --git a/remoting/client/plugin/pepper_video_renderer_2d.h b/remoting/client/plugin/pepper_video_renderer_2d.h
|
| index f4580fade8bfd06c8854ad57ed1e7b56b09abb7c..e772998a0d03a90d60ac2dbfc83bab9c954ce579 100644
|
| --- a/remoting/client/plugin/pepper_video_renderer_2d.h
|
| +++ b/remoting/client/plugin/pepper_video_renderer_2d.h
|
| @@ -58,9 +58,9 @@ class PepperVideoRenderer2D : public PepperVideoRenderer,
|
|
|
| private:
|
| // protocol::FrameConsumer implementation.
|
| - scoped_ptr<webrtc::DesktopFrame> AllocateFrame(
|
| + std::unique_ptr<webrtc::DesktopFrame> AllocateFrame(
|
| const webrtc::DesktopSize& size) override;
|
| - void DrawFrame(scoped_ptr<webrtc::DesktopFrame> frame,
|
| + void DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
|
| const base::Closure& done) override;
|
| PixelFormat GetPixelFormat() override;
|
|
|
| @@ -74,7 +74,7 @@ class PepperVideoRenderer2D : public PepperVideoRenderer,
|
|
|
| pp::Graphics2D graphics2d_;
|
|
|
| - scoped_ptr<SoftwareVideoRenderer> software_video_renderer_;
|
| + std::unique_ptr<SoftwareVideoRenderer> software_video_renderer_;
|
|
|
| // View size in output pixels.
|
| webrtc::DesktopSize view_size_;
|
|
|