Fork cc::OutputSurface into cc::CompositorFrameSink.

content/renderer/gpu/render_widget_compositor.h

Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 2bed4bfb9989683bde1321e2ee72855714595301..657f68a41c8483c57525267c898f072b3663424b 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -176,9 +176,9 @@ class CONTENT_EXPORT RenderWidgetCompositor
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
                            float top_controls_delta) override;
-  void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface() override;
-  void DidFailToInitializeOutputSurface() override;
+  void RequestNewCompositorFrameSink() override;
+  void DidInitializeCompositorFrameSink() override;
+  void DidFailToInitializeCompositorFrameSink() override;
   void WillCommit() override;
   void DidCommit() override;
   void DidCommitAndDrawFrame() override;
@@ -195,8 +195,8 @@ class CONTENT_EXPORT RenderWidgetCompositor
   void SendCompositorProto(const cc::proto::CompositorMessage& proto) override;
 
   enum {
-    OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK = 4,
-    MAX_OUTPUT_SURFACE_RETRIES = 5,
+    COMPOSITOR_FRAME_SINK_RETRIES_BEFORE_FALLBACK = 4,
+    MAX_COMPOSITOR_FRAME_SINK_RETRIES = 5,
   };
 
  protected: