sync compositor: Add output_surface_id

content/public/test/test_synchronous_compositor_android.cc

Index: content/public/test/test_synchronous_compositor_android.cc
diff --git a/content/public/test/test_synchronous_compositor_android.cc b/content/public/test/test_synchronous_compositor_android.cc
index 9eff3ff3d104cfddf6fee2511f84a5c81b75cc27..609cdf46ed5c6ecdc4c8e2e25f1175b46c1fcd3b 100644
--- a/content/public/test/test_synchronous_compositor_android.cc
+++ b/content/public/test/test_synchronous_compositor_android.cc
@@ -27,7 +27,7 @@ void TestSynchronousCompositor::SetClient(SynchronousCompositorClient* client) {
   }
 }
 
-scoped_ptr<cc::CompositorFrame> TestSynchronousCompositor::DemandDrawHw(
+SynchronousCompositor::Frame TestSynchronousCompositor::DemandDrawHw(
     const gfx::Size& surface_size,
     const gfx::Transform& transform,
     const gfx::Rect& viewport,
@@ -37,14 +37,35 @@ scoped_ptr<cc::CompositorFrame> TestSynchronousCompositor::DemandDrawHw(
   return std::move(hardware_frame_);
 }
 
+void TestSynchronousCompositor::ReturnResources(
+    uint32_t output_surface_id,
+    const cc::CompositorFrameAck& frame_ack) {
+  ReturnedResources returned_resources;
+  returned_resources.output_surface_id = output_surface_id;
+  returned_resources.resources = frame_ack.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,
     scoped_ptr<cc::CompositorFrame> frame) {
-  hardware_frame_ = std::move(frame);
+  hardware_frame_.output_surface_id = output_surface_id;
+  hardware_frame_.frame = std::move(frame);
 }
 
+TestSynchronousCompositor::ReturnedResources::ReturnedResources()
+    : output_surface_id(0u) {}
+
+TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {}
+
 }  // namespace content