Replace usage of SurfaceId's client_id with FrameSinkId

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 409872eff4a62c230ab61892d8eb34d5509d979a..70cd8b1fb03486446974c6c78af4de21d65520a6 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -70,17 +70,17 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
   // Not all tests initialize or need a context provider factory.
   if (ContextProviderFactoryImpl::GetInstance()) {
     surface_id_allocator_.reset(
-        new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));
-    GetSurfaceManager()->RegisterSurfaceClientId(
-        surface_id_allocator_->client_id());
+        new cc::SurfaceIdAllocator(AllocateFrameSinkId()));
+    GetSurfaceManager()->RegisterFrameSinkId(
+        surface_id_allocator_->frame_sink_id());
   }
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance()) {
     surface_id_allocator_.reset(
-        new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));
-    GetSurfaceManager()->RegisterSurfaceClientId(
-        surface_id_allocator_->client_id());
+        new cc::SurfaceIdAllocator(AllocateFrameSinkId()));
+    GetSurfaceManager()->RegisterFrameSinkId(
+        surface_id_allocator_->frame_sink_id());
   }
 #endif
 
@@ -96,7 +96,7 @@ TestRenderWidgetHostView::~TestRenderWidgetHostView() {
   manager = GetSurfaceManager();
 #endif
   if (manager) {
-    manager->InvalidateSurfaceClientId(surface_id_allocator_->client_id());
+    manager->InvalidateFrameSinkId(surface_id_allocator_->frame_sink_id());
   }
 }
 
@@ -228,11 +228,11 @@ bool TestRenderWidgetHostView::LockMouse() {
 void TestRenderWidgetHostView::UnlockMouse() {
 }
 
-uint32_t TestRenderWidgetHostView::GetSurfaceClientId() {
+cc::FrameSinkId TestRenderWidgetHostView::GetFrameSinkId() {
   // See constructor.  If a test needs this, its harness needs to construct an
   // ImageTransportFactory.
   DCHECK(surface_id_allocator_);
-  return surface_id_allocator_->client_id();
+  return surface_id_allocator_->frame_sink_id();
 }
 
 TestRenderViewHost::TestRenderViewHost(