Fork cc::OutputSurface into cc::CompositorFrameSink.

content/public/test/test_synchronous_compositor_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_synchronous_compositor_android.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 
@@ skipping 21 matching lines @@
     const gfx::Transform& transform_for_tile_priority) {
   return std::move(hardware_frame_);
 }
 
 void TestSynchronousCompositor::DemandDrawHwAsync(
     const gfx::Size& viewport_size,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {}
 
 void TestSynchronousCompositor::ReturnResources(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     const cc::ReturnedResourceArray& resources) {
   ReturnedResources returned_resources;
-  returned_resources.output_surface_id = output_surface_id;
+  returned_resources.compositor_frame_sink_id = compositor_frame_sink_id;
   returned_resources.resources = resources;
   frame_ack_array_.push_back(returned_resources);
 }
 
 void TestSynchronousCompositor::SwapReturnedResources(FrameAckArray* array) {
   DCHECK(array);
   frame_ack_array_.swap(*array);
 }
 
 bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(canvas);
   return true;
 }
 
 void TestSynchronousCompositor::SetHardwareFrame(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     std::unique_ptr<cc::CompositorFrame> frame) {
-  hardware_frame_.output_surface_id = output_surface_id;
+  hardware_frame_.compositor_frame_sink_id = compositor_frame_sink_id;
   hardware_frame_.frame = std::move(frame);
 }
 
 TestSynchronousCompositor::ReturnedResources::ReturnedResources()
-    : output_surface_id(0u) {}
+    : compositor_frame_sink_id(0u) {}
 
 TestSynchronousCompositor::ReturnedResources::ReturnedResources(
     const ReturnedResources& other) = default;
 
 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {}
 
 }  // namespace content