[WIP] cc: Plumb SurfaceId from clients

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 29fc6f7c8b8d9649435e149c928e37ee873ad415..40067367d573d7c72e5312581e86bc39d323a01c 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -64,11 +64,13 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
       is_occluded_(false),
       did_swap_compositor_frame_(false) {
 #if defined(OS_ANDROID)
-    surface_id_allocator_ = CreateSurfaceIdAllocator();
+  surface_id_allocator_ =
+      base::WrapUnique(new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance())
-    surface_id_allocator_ = CreateSurfaceIdAllocator();
+    surface_id_allocator_ =
+        base::WrapUnique(new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));
 #endif
 
   rwh_->SetView(this);
@@ -194,6 +196,7 @@ gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() {
 
 void TestRenderWidgetHostView::OnSwapCompositorFrame(
     uint32_t output_surface_id,
+    const cc::SurfaceId& surface_id,
     cc::CompositorFrame frame) {
   did_swap_compositor_frame_ = true;
 }