Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/android/synchronous_compositor_host.h

Index: content/browser/android/synchronous_compositor_host.h
diff --git a/content/browser/android/synchronous_compositor_host.h b/content/browser/android/synchronous_compositor_host.h
index 9cd39a5f654645b828f72c1dfd2687f5a04f8e6d..44b0bc2d65fec7c7172c35e1a89e519620af7c0e 100644
--- a/content/browser/android/synchronous_compositor_host.h
+++ b/content/browser/android/synchronous_compositor_host.h
@@ -63,7 +63,7 @@ class SynchronousCompositorHost : public SynchronousCompositor {
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
   bool DemandDrawSw(SkCanvas* canvas) override;
-  void ReturnResources(uint32_t output_surface_id,
+  void ReturnResources(uint32_t compositor_frame_sink_id,
                        const cc::ReturnedResourceArray& resources) override;
   void SetMemoryPolicy(size_t bytes_limit) override;
   void DidChangeRootLayerScrollOffset(
@@ -91,12 +91,12 @@ class SynchronousCompositorHost : public SynchronousCompositor {
                             SynchronousCompositorClient* client,
                             bool use_in_proc_software_draw);
   void UpdateFrameMetaData(cc::CompositorFrameMetadata frame_metadata);
-  void OutputSurfaceCreated();
+  void CompositorFrameSinkCreated();
   bool DemandDrawSwInProc(SkCanvas* canvas);
   void SetSoftwareDrawSharedMemoryIfNeeded(size_t stride, size_t buffer_size);
   void SendZeroMemory();
   SynchronousCompositor::Frame ProcessHardwareFrame(
-      uint32_t output_surface_id,
+      uint32_t compositor_frame_sink_id,
       cc::CompositorFrame compositor_frame);
   bool DemandDrawHwReceiveFrame(const IPC::Message& message);