Replace usage of SurfaceId's client_id with FrameSinkId

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 52 matching lines @@
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
       is_showing_(false),
       is_occluded_(false),
       did_swap_compositor_frame_(false) {
 #if defined(OS_ANDROID)
   // 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
 
   rwh_->SetView(this);
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
   cc::SurfaceManager* manager = nullptr;
 #if defined(OS_ANDROID)
   if (ContextProviderFactoryImpl::GetInstance())
     manager = GetSurfaceManager();
 #else
   manager = GetSurfaceManager();
 #endif
   if (manager) {
-    manager->InvalidateSurfaceClientId(surface_id_allocator_->client_id());
+    manager->InvalidateFrameSinkId(surface_id_allocator_->frame_sink_id());
   }
 }
 
 RenderWidgetHost* TestRenderWidgetHostView::GetRenderWidgetHost() const {
   return rwh_;
 }
 
 gfx::Vector2dF TestRenderWidgetHostView::GetLastScrollOffset() const {
   return gfx::Vector2dF();
 }
@@ skipping 111 matching lines @@
   did_swap_compositor_frame_ = true;
 }
 
 bool TestRenderWidgetHostView::LockMouse() {
   return false;
 }
 
 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(
     SiteInstance* instance,
     std::unique_ptr<RenderWidgetHostImpl> widget,
     RenderViewHostDelegate* delegate,
     int32_t main_frame_routing_id,
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          std::move(widget),
@@ skipping 105 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content