Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/remote_channel_main.cc

Index: cc/trees/remote_channel_main.cc
diff --git a/cc/trees/remote_channel_main.cc b/cc/trees/remote_channel_main.cc
index 92619ba06b763d28d0f87a2a12a95ae233cba648..6d3aa0095a26f9f32c7fc87bb66dc4e77f0d7968 100644
--- a/cc/trees/remote_channel_main.cc
+++ b/cc/trees/remote_channel_main.cc
@@ -63,8 +63,8 @@ void RemoteChannelMain::UpdateTopControlsStateOnImpl(
     TopControlsState current,
     bool animate) {}
 
-void RemoteChannelMain::InitializeOutputSurfaceOnImpl(
-    OutputSurface* output_surface) {
+void RemoteChannelMain::InitializeCompositorFrameSinkOnImpl(
+    CompositorFrameSink*) {
   NOTREACHED() << "Should not be called on the server LayerTreeHost";
 }
 
@@ -99,7 +99,7 @@ void RemoteChannelMain::SetVisibleOnImpl(bool visible) {
   NOTIMPLEMENTED() << "Visibility is not controlled by the server";
 }
 
-void RemoteChannelMain::ReleaseOutputSurfaceOnImpl(
+void RemoteChannelMain::ReleaseCompositorFrameSinkOnImpl(
     CompletionEvent* completion) {
   NOTREACHED() << "Should not be called on the server LayerTreeHost";
   completion->Signal();