Index: cc/trees/channel_impl.h |
diff --git a/cc/trees/channel_impl.h b/cc/trees/channel_impl.h |
index d5d3159cc442f641c975196a4e68b1399e4d4b40..f2c29338eaf26d06fa49fb176a33a042081b6b01 100644 |
--- a/cc/trees/channel_impl.h |
+++ b/cc/trees/channel_impl.h |
@@ -26,7 +26,7 @@ class CC_EXPORT ChannelImpl { |
const RendererCapabilities& capabilities) = 0; |
virtual void BeginMainFrameNotExpectedSoon() = 0; |
virtual void DidCommitAndDrawFrame() = 0; |
- virtual void SetAnimationEvents(scoped_ptr<AnimationEvents> queue) = 0; |
+ virtual void SetAnimationEvents(std::unique_ptr<AnimationEvents> queue) = 0; |
virtual void DidLoseOutputSurface() = 0; |
virtual void RequestNewOutputSurface() = 0; |
virtual void DidInitializeOutputSurface( |
@@ -34,10 +34,11 @@ class CC_EXPORT ChannelImpl { |
const RendererCapabilities& capabilities) = 0; |
virtual void DidCompletePageScaleAnimation() = 0; |
virtual void PostFrameTimingEventsOnMain( |
- scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
- scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) = 0; |
+ std::unique_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
+ std::unique_ptr<FrameTimingTracker::MainFrameTimingSet> |
+ main_frame_events) = 0; |
virtual void BeginMainFrame( |
- scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) = 0; |
+ std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) = 0; |
protected: |
virtual ~ChannelImpl() {} |