sync compositor: Add output_surface_id

content/public/test/test_synchronous_compositor_android.h

Index: content/public/test/test_synchronous_compositor_android.h
diff --git a/content/public/test/test_synchronous_compositor_android.h b/content/public/test/test_synchronous_compositor_android.h
index b9f0c85f97054018b5b82c134d6611f76197e56a..cc98bec776821bb81a43706231b72b43ba4e273c 100644
--- a/content/public/test/test_synchronous_compositor_android.h
+++ b/content/public/test/test_synchronous_compositor_android.h
@@ -22,14 +22,15 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
   void SetClient(SynchronousCompositorClient* client);
 
   // SynchronousCompositor overrides.
-  scoped_ptr<cc::CompositorFrame> DemandDrawHw(
+  SynchronousCompositor::Frame DemandDrawHw(
       const gfx::Size& surface_size,
       const gfx::Transform& transform,
       const gfx::Rect& viewport,
       const gfx::Rect& clip,
       const gfx::Rect& viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
-  void ReturnResources(const cc::CompositorFrameAck& frame_ack) override {}
+  void ReturnResources(uint32_t output_surface_id,
+                       const cc::CompositorFrameAck& frame_ack) override {}
   bool DemandDrawSw(SkCanvas* canvas) override;
   void SetMemoryPolicy(size_t bytes_limit) override {}
   void DidChangeRootLayerScrollOffset(
@@ -37,11 +38,12 @@ class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
   void SetIsActive(bool is_active) override {}
   void OnComputeScroll(base::TimeTicks animate_time) override {}
 
-  void SetHardwareFrame(scoped_ptr<cc::CompositorFrame> frame);
+  void SetHardwareFrame(uint32_t output_surface_id,
+                        scoped_ptr<cc::CompositorFrame> frame);
 
  private:
   SynchronousCompositorClient* client_;
-  scoped_ptr<cc::CompositorFrame> hardware_frame_;
+  SynchronousCompositor::Frame hardware_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSynchronousCompositor);
 };