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..10258e8c1455f2b94f67cef791ee3b6d02dd4f09 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,
@@ -43,8 +43,10 @@ bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) {
 }
 
 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);
 }
 
 }  // namespace content