Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/threaded_channel.h

Index: cc/trees/threaded_channel.h
diff --git a/cc/trees/threaded_channel.h b/cc/trees/threaded_channel.h
index a290a46397851f7713565f19e8bbc779849f06f8..d54047d59ca6c7a1a118870ab2ecc0190b24a892 100644
--- a/cc/trees/threaded_channel.h
+++ b/cc/trees/threaded_channel.h
@@ -50,12 +50,12 @@ class ProxyMain;
 //                                                          .
 //                                                          .
 //                                          ProxyImpl::ScheduledActionBegin
-//                                                     OutputSurfaceCreation
+//                                                   CompositorFrameSinkCreation
 //                                                          |
-//                                         ChannelImpl::RequestNewOutputSurface
+//                                    ChannelImpl::RequestNewCompositorFrameSink
 // ----------------------------------------------------------------------------
 //                                                          |
-// ProxyMain->RequestNewOutputSurface()<----PostTask--------
+// ProxyMain->RequestNewCompositorFrameSink()<----PostTask--------
 //              .
 //              .
 // ProxyMain->Stop()
@@ -87,7 +87,8 @@ class CC_EXPORT ThreadedChannel : public ChannelMain, public ChannelImpl {
   void UpdateTopControlsStateOnImpl(TopControlsState constraints,
                                     TopControlsState current,
                                     bool animate) override;
-  void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) override;
+  void InitializeCompositorFrameSinkOnImpl(
+      CompositorFrameSink* output_surface) override;
   void InitializeMutatorOnImpl(
       std::unique_ptr<LayerTreeMutator> mutator) override;
   void MainThreadHasStoppedFlingingOnImpl() override;
@@ -102,7 +103,7 @@ class CC_EXPORT ThreadedChannel : public ChannelMain, public ChannelImpl {
   void SetVisibleOnImpl(bool visible) override;
 
   // Blocking calls to ProxyImpl
-  void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion) override;
+  void ReleaseCompositorFrameSinkOnImpl(CompletionEvent* completion) override;
   void MainFrameWillHappenOnImplForTesting(
       CompletionEvent* completion,
       bool* main_frame_will_happen) override;
@@ -120,9 +121,9 @@ class CC_EXPORT ThreadedChannel : public ChannelMain, public ChannelImpl {
   void BeginMainFrameNotExpectedSoon() override;
   void DidCommitAndDrawFrame() override;
   void SetAnimationEvents(std::unique_ptr<AnimationEvents> events) override;
-  void DidLoseOutputSurface() override;
-  void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface(bool success) override;
+  void DidLoseCompositorFrameSink() override;
+  void RequestNewCompositorFrameSink() override;
+  void DidInitializeCompositorFrameSink(bool success) override;
   void DidCompletePageScaleAnimation() override;
   void BeginMainFrame(std::unique_ptr<BeginMainFrameAndCommitState>
                           begin_main_frame_state) override;