Fork cc::OutputSurface into cc::CompositorFrameSink.

content/public/browser/android/synchronous_compositor.cc

Index: content/public/browser/android/synchronous_compositor.cc
diff --git a/content/public/browser/android/synchronous_compositor.cc b/content/public/browser/android/synchronous_compositor.cc
index 4e52b6130c4a37269f351cdced838b4b55b64d72..616530fc7de376d22f2008ab69c58e33307bbb10 100644
--- a/content/public/browser/android/synchronous_compositor.cc
+++ b/content/public/browser/android/synchronous_compositor.cc
@@ -10,16 +10,17 @@
 
 namespace content {
 
-SynchronousCompositor::Frame::Frame() : output_surface_id(0u) {}
+SynchronousCompositor::Frame::Frame() : compositor_frame_sink_id(0u) {}
 
 SynchronousCompositor::Frame::~Frame() {}
 
 SynchronousCompositor::Frame::Frame(Frame&& rhs)
-    : output_surface_id(rhs.output_surface_id), frame(std::move(rhs.frame)) {}
+    : compositor_frame_sink_id(rhs.compositor_frame_sink_id),
+      frame(std::move(rhs.frame)) {}
 
 SynchronousCompositor::Frame& SynchronousCompositor::Frame::operator=(
     Frame&& rhs) {
-  output_surface_id = rhs.output_surface_id;
+  compositor_frame_sink_id = rhs.compositor_frame_sink_id;
   frame = std::move(rhs.frame);
   return *this;
 }