[WIP] cc: Plumb SurfaceId from clients

content/test/test_render_view_host.cc

 // Copyright (c) 2012 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/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 46 matching lines @@
   params->method = "GET";
   params->page_state = PageState::CreateFromURL(url);
 }
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
       is_showing_(false),
       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);
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
 }
 
 RenderWidgetHost* TestRenderWidgetHostView::GetRenderWidgetHost() const {
   return rwh_;
@@ skipping 105 matching lines @@
 }
 
 #endif
 
 gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() {
   return gfx::Rect();
 }
 
 void TestRenderWidgetHostView::OnSwapCompositorFrame(
     uint32_t output_surface_id,
+    const cc::SurfaceId& surface_id,
     cc::CompositorFrame frame) {
   did_swap_compositor_frame_ = true;
 }
 
 bool TestRenderWidgetHostView::LockMouse() {
   return false;
 }
 
 void TestRenderWidgetHostView::UnlockMouse() {
 }
@@ skipping 121 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content