Fork cc::OutputSurface into cc::CompositorFrameSink.

content/public/test/test_synchronous_compositor_android.h

Index: content/public/test/test_synchronous_compositor_android.h
diff --git a/content/public/test/test_synchronous_compositor_android.h b/content/public/test/test_synchronous_compositor_android.h
index 01cea0cc1cb39f490614619eb3f2591aa7c0efe9..f9a44861109dc8a30446f63b09ce9b5ffe9e8646 100644
--- a/content/public/test/test_synchronous_compositor_android.h
+++ b/content/public/test/test_synchronous_compositor_android.h
@@ -32,7 +32,7 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
       const gfx::Size& viewport_size,
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
-  void ReturnResources(uint32_t output_surface_id,
+  void ReturnResources(uint32_t compositor_frame_sink_id,
                        const cc::ReturnedResourceArray& resources) override;
   bool DemandDrawSw(SkCanvas* canvas) override;
   void SetMemoryPolicy(size_t bytes_limit) override {}
@@ -42,7 +42,7 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
                            const gfx::Point& anchor) override {}
   void OnComputeScroll(base::TimeTicks animate_time) override {}
 
-  void SetHardwareFrame(uint32_t output_surface_id,
+  void SetHardwareFrame(uint32_t compositor_frame_sink_id,
                         std::unique_ptr<cc::CompositorFrame> frame);
 
   struct ReturnedResources {
@@ -50,7 +50,7 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
     ReturnedResources(const ReturnedResources& other);
     ~ReturnedResources();
 
-    uint32_t output_surface_id;
+    uint32_t compositor_frame_sink_id;
     cc::ReturnedResourceArray resources;
   };
   using FrameAckArray = std::vector<ReturnedResources>;