1 files changed, 8 insertions, 14 deletions

diff --git a/chromium/cc/trees/proxy_main.h b/chromium/cc/trees/proxy_main.h
index 1b627dda42c..ab465610805 100644
--- a/chromium/cc/trees/proxy_main.h
+++ b/chromium/cc/trees/proxy_main.h
@@ -7,7 +7,6 @@
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
-#include "cc/debug/frame_timing_tracker.h"
 #include "cc/input/top_controls_state.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_capabilities.h"
@@ -28,11 +27,11 @@ class LayerTreeHost;
 // The class is created and lives on the main thread.
 class CC_EXPORT ProxyMain : public Proxy {
  public:
-  static scoped_ptr<ProxyMain> CreateThreaded(
+  static std::unique_ptr<ProxyMain> CreateThreaded(
       LayerTreeHost* layer_tree_host,
       TaskRunnerProvider* task_runner_provider);
 
-  static scoped_ptr<ProxyMain> CreateRemote(
+  static std::unique_ptr<ProxyMain> CreateRemote(
       RemoteProtoChannel* remote_proto_channel,
       LayerTreeHost* layer_tree_host,
       TaskRunnerProvider* task_runner_provider);
@@ -55,18 +54,15 @@ class CC_EXPORT ProxyMain : public Proxy {
       const RendererCapabilities& capabilities);
   virtual void BeginMainFrameNotExpectedSoon();
   virtual void DidCommitAndDrawFrame();
-  virtual void SetAnimationEvents(scoped_ptr<AnimationEvents> events);
+  virtual void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
   virtual void DidLoseOutputSurface();
   virtual void RequestNewOutputSurface();
   virtual void DidInitializeOutputSurface(
       bool success,
       const RendererCapabilities& capabilities);
   virtual void DidCompletePageScaleAnimation();
-  virtual void PostFrameTimingEventsOnMain(
-      scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
-      scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events);
   virtual void BeginMainFrame(
-      scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
+      std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
 
   ChannelMain* channel_main() const { return channel_main_.get(); }
   CommitPipelineStage max_requested_pipeline_stage() const {
@@ -103,20 +99,18 @@ class CC_EXPORT ProxyMain : public Proxy {
   bool CommitRequested() const override;
   bool BeginMainFrameRequested() const override;
   void MainThreadHasStoppedFlinging() override;
-  void Start(scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
+  void Start(
+      std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
   void Stop() override;
   bool SupportsImplScrolling() const override;
   bool MainFrameWillHappenForTesting() override;
-  void SetChildrenNeedBeginFrames(bool children_need_begin_frames) override;
-  void SetAuthoritativeVSyncInterval(const base::TimeDelta& interval) override;
   void ReleaseOutputSurface() override;
   void UpdateTopControlsState(TopControlsState constraints,
                               TopControlsState current,
                               bool animate) override;
-  void SetOutputIsSecure(bool output_is_secure) override;
 
   // This sets the channel used by ProxyMain to communicate with ProxyImpl.
-  void SetChannel(scoped_ptr<ChannelMain> channel_main);
+  void SetChannel(std::unique_ptr<ChannelMain> channel_main);
 
   // Returns |true| if the request was actually sent, |false| if one was
   // already outstanding.
@@ -150,7 +144,7 @@ class CC_EXPORT ProxyMain : public Proxy {
 
   RendererCapabilities renderer_capabilities_;
 
-  scoped_ptr<ChannelMain> channel_main_;
+  std::unique_ptr<ChannelMain> channel_main_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMain);
 };