Index: remoting/protocol/capture_scheduler.h |
diff --git a/remoting/protocol/capture_scheduler.h b/remoting/protocol/capture_scheduler.h |
index 3f4369aea543bd320a289dac5e9da7f64e6d8ede..a2228f6b6fd98a4ba71eb4bd674e1ae6d8d7bb0c 100644 |
--- a/remoting/protocol/capture_scheduler.h |
+++ b/remoting/protocol/capture_scheduler.h |
@@ -54,7 +54,7 @@ class CaptureScheduler : public VideoFeedbackStub { |
void OnFrameSent(); |
// VideoFeedbackStub interface. |
- void ProcessVideoAck(scoped_ptr<VideoAck> video_ack) override; |
+ void ProcessVideoAck(std::unique_ptr<VideoAck> video_ack) override; |
// Sets minimum interval between frames. |
void set_minimum_interval(base::TimeDelta minimum_interval) { |
@@ -62,8 +62,8 @@ class CaptureScheduler : public VideoFeedbackStub { |
} |
// Helper functions for tests. |
- void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock); |
- void SetTimerForTest(scoped_ptr<base::Timer> timer); |
+ void SetTickClockForTest(std::unique_ptr<base::TickClock> tick_clock); |
+ void SetTimerForTest(std::unique_ptr<base::Timer> timer); |
void SetNumOfProcessorsForTest(int num_of_processors); |
private: |
@@ -78,10 +78,10 @@ class CaptureScheduler : public VideoFeedbackStub { |
base::Closure capture_closure_; |
- scoped_ptr<base::TickClock> tick_clock_; |
+ std::unique_ptr<base::TickClock> tick_clock_; |
// Timer used to schedule CaptureNextFrame(). |
- scoped_ptr<base::Timer> capture_timer_; |
+ std::unique_ptr<base::Timer> capture_timer_; |
// Minimum interval between frames that determines maximum possible framerate. |
base::TimeDelta minimum_interval_; |