Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/remote_channel_main.h

Index: cc/trees/remote_channel_main.h
diff --git a/cc/trees/remote_channel_main.h b/cc/trees/remote_channel_main.h
index b6d15bb808292669cf7844d1b99cc905d0bf2c0a..98fc8b514ed3da8bf58e1c5442cfe7feeb79d530 100644
--- a/cc/trees/remote_channel_main.h
+++ b/cc/trees/remote_channel_main.h
@@ -33,14 +33,14 @@ class CC_EXPORT RemoteChannelMain : public ChannelMain,
   void UpdateTopControlsStateOnImpl(TopControlsState constraints,
                                     TopControlsState current,
                                     bool animate) override;
-  void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) override;
+  void InitializeCompositorFrameSinkOnImpl(CompositorFrameSink*) override;
   void InitializeMutatorOnImpl(
       std::unique_ptr<LayerTreeMutator> mutator) override;
   void MainThreadHasStoppedFlingingOnImpl() override;
   void SetInputThrottledUntilCommitOnImpl(bool is_throttled) override;
   void SetDeferCommitsOnImpl(bool defer_commits) override;
   void SetVisibleOnImpl(bool visible) override;
-  void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion) override;
+  void ReleaseCompositorFrameSinkOnImpl(CompletionEvent* completion) override;
   void MainFrameWillHappenOnImplForTesting(
       CompletionEvent* completion,
       bool* main_frame_will_happen) override;