| Index: media/blink/video_frame_compositor.h
|
| diff --git a/media/blink/video_frame_compositor.h b/media/blink/video_frame_compositor.h
|
| index 893fa7c43688f5a3218b9a88a2e402b061e498b7..1ae8db285584d857b631f5dd26a3f93eb4600f2a 100644
|
| --- a/media/blink/video_frame_compositor.h
|
| +++ b/media/blink/video_frame_compositor.h
|
| @@ -111,7 +111,7 @@ class MEDIA_BLINK_EXPORT VideoFrameCompositor
|
| // PaintFrameUsingOldRenderingPath() is not also called while stopped.)
|
| base::TimeDelta GetCurrentFrameTimestamp() const;
|
|
|
| - void set_tick_clock_for_testing(scoped_ptr<base::TickClock> tick_clock) {
|
| + void set_tick_clock_for_testing(std::unique_ptr<base::TickClock> tick_clock) {
|
| tick_clock_ = std::move(tick_clock);
|
| }
|
|
|
| @@ -148,7 +148,7 @@ class MEDIA_BLINK_EXPORT VideoFrameCompositor
|
| bool background_rendering);
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
|
| - scoped_ptr<base::TickClock> tick_clock_;
|
| + std::unique_ptr<base::TickClock> tick_clock_;
|
|
|
| // These callbacks are executed on the compositor thread.
|
| const base::Callback<void(gfx::Size)> natural_size_changed_cb_;
|
|
|