Fork cc::OutputSurface into cc::CompositorFrameSink.

content/public/browser/android/synchronous_compositor.h

Index: content/public/browser/android/synchronous_compositor.h
diff --git a/content/public/browser/android/synchronous_compositor.h b/content/public/browser/android/synchronous_compositor.h
index 4231a2d08caf8643ce188d93c4744e9d93e33634..5b8b72328f5d55ff681c725f1c29db00564eca41 100644
--- a/content/public/browser/android/synchronous_compositor.h
+++ b/content/public/browser/android/synchronous_compositor.h
@@ -52,7 +52,7 @@ class CONTENT_EXPORT SynchronousCompositor {
     Frame(Frame&& rhs);
     Frame& operator=(Frame&& rhs);
 
-    uint32_t output_surface_id;
+    uint32_t compositor_frame_sink_id;
     std::unique_ptr<cc::CompositorFrame> frame;
 
    private:
@@ -78,7 +78,7 @@ class CONTENT_EXPORT SynchronousCompositor {
 
   // For delegated rendering, return resources from parent compositor to this.
   // Note that all resources must be returned before ReleaseHwDraw.
-  virtual void ReturnResources(uint32_t output_surface_id,
+  virtual void ReturnResources(uint32_t compositor_frame_sink_id,
                                const cc::ReturnedResourceArray& resources) = 0;
 
   // "On demand" SW draw, into the supplied canvas (observing the transform