Replace usage of SurfaceId's client_id with FrameSinkId

content/browser/renderer_host/context_provider_factory_impl_android.cc

Index: content/browser/renderer_host/context_provider_factory_impl_android.cc
diff --git a/content/browser/renderer_host/context_provider_factory_impl_android.cc b/content/browser/renderer_host/context_provider_factory_impl_android.cc
index 86ad70a34c0f942534ba3491fa053a899af9e924..7c919113ff257bbd4d54766fcd14a4afe58cd3da 100644
--- a/content/browser/renderer_host/context_provider_factory_impl_android.cc
+++ b/content/browser/renderer_host/context_provider_factory_impl_android.cc
@@ -66,7 +66,7 @@ ContextProviderFactoryImpl::ContextProviderFactoryImpl(
     : gpu_channel_factory_(gpu_channel_factory),
       in_handle_pending_requests_(false),
       in_shutdown_(false),
-      surface_client_id_(0),
+      next_client_id_(1u),
       weak_factory_(this) {
   DCHECK(gpu_channel_factory_);
 }
@@ -135,8 +135,8 @@ cc::SurfaceManager* ContextProviderFactoryImpl::GetSurfaceManager() {
   return surface_manager_.get();
 }
 
-uint32_t ContextProviderFactoryImpl::AllocateSurfaceClientId() {
-  return ++surface_client_id_;
+cc::FrameSinkId ContextProviderFactoryImpl::AllocateFrameSinkId() {
+  return cc::FrameSinkId(++next_client_id_, 0 /* sink_id */);
 }
 
 cc::SharedBitmapManager* ContextProviderFactoryImpl::GetSharedBitmapManager() {