Index: remoting/protocol/fake_video_renderer.h |
diff --git a/remoting/protocol/fake_video_renderer.h b/remoting/protocol/fake_video_renderer.h |
index 60a7088817d2c6903924548a0336f2ab4a1dd08f..b8fde3c41725add14aa3b413efac4a1969995479 100644 |
--- a/remoting/protocol/fake_video_renderer.h |
+++ b/remoting/protocol/fake_video_renderer.h |
@@ -6,9 +6,9 @@ |
#define REMOTING_PROTOCOL_FAKE_VIDEO_RENDERER_H_ |
#include <list> |
+#include <memory> |
#include "base/callback.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "remoting/protocol/frame_consumer.h" |
#include "remoting/protocol/video_renderer.h" |
@@ -22,19 +22,20 @@ class FakeVideoStub : public VideoStub { |
FakeVideoStub(); |
~FakeVideoStub() override; |
- const std::list<scoped_ptr<VideoPacket>>& received_packets() { |
+ const std::list<std::unique_ptr<VideoPacket>>& received_packets() { |
return received_packets_; |
} |
void set_on_frame_callback(base::Closure on_frame_callback); |
// VideoStub interface. |
- void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet, |
+ void ProcessVideoPacket(std::unique_ptr<VideoPacket> video_packet, |
const base::Closure& done) override; |
+ |
private: |
base::ThreadChecker thread_checker_; |
- std::list<scoped_ptr<VideoPacket>> received_packets_; |
+ std::list<std::unique_ptr<VideoPacket>> received_packets_; |
base::Closure on_frame_callback_; |
}; |
@@ -43,23 +44,23 @@ class FakeFrameConsumer : public FrameConsumer { |
FakeFrameConsumer(); |
~FakeFrameConsumer() override; |
- const std::list<scoped_ptr<webrtc::DesktopFrame>>& received_frames() { |
+ const std::list<std::unique_ptr<webrtc::DesktopFrame>>& received_frames() { |
return received_frames_; |
} |
void set_on_frame_callback(base::Closure on_frame_callback); |
// FrameConsumer interface. |
- 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; |
private: |
base::ThreadChecker thread_checker_; |
- std::list<scoped_ptr<webrtc::DesktopFrame>> received_frames_; |
+ std::list<std::unique_ptr<webrtc::DesktopFrame>> received_frames_; |
base::Closure on_frame_callback_; |
}; |