Fork cc::OutputSurface into cc::CompositorFrameSink.

blimp/client/app/compositor/browser_compositor.h

Index: blimp/client/app/compositor/browser_compositor.h
diff --git a/blimp/client/app/compositor/browser_compositor.h b/blimp/client/app/compositor/browser_compositor.h
index 1a5cdc79b3000646606a30a998a888a7bd8d4fd9..b24a761d67b9c1072ab6f16949f5bffc6712cd8a 100644
--- a/blimp/client/app/compositor/browser_compositor.h
+++ b/blimp/client/app/compositor/browser_compositor.h
@@ -62,9 +62,9 @@ class BrowserCompositor : public cc::LayerTreeHostClient,
                            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 {}
@@ -75,13 +75,13 @@ class BrowserCompositor : public cc::LayerTreeHostClient,
   void DidPostSwapBuffers() override {}
   void DidAbortSwapBuffers() override {}
 
-  void HandlePendingOutputSurfaceRequest();
+  void HandlePendingCompositorFrameSinkRequest();
 
   CompositorDependencies* compositor_dependencies_;
 
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   gfx::AcceleratedWidget widget_;
-  bool output_surface_request_pending_;
+  bool compositor_frame_sink_request_pending_;
   std::unique_ptr<cc::Display> display_;
 
   gfx::Size viewport_size_in_px_;