Replace usage of SurfaceId's client_id with FrameSinkId

content/browser/renderer_host/context_provider_factory_impl_android.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_
 
 #include <queue>
 
 #include "base/macros.h"
@@ skipping 45 matching lines @@
   void RequestGpuChannelHost(GpuChannelHostCallback callback) override;
   scoped_refptr<cc::ContextProvider> CreateOffscreenContextProvider(
       ContextType context_type,
       gpu::SharedMemoryLimits shared_memory_limits,
       gpu::gles2::ContextCreationAttribHelper attributes,
       bool support_locking,
       bool automatic_flushes,
       cc::ContextProvider* shared_context_provider,
       scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) override;
   cc::SurfaceManager* GetSurfaceManager() override;
-  uint32_t AllocateSurfaceClientId() override;
+  cc::FrameSinkId AllocateFrameSinkId() override;
   cc::SharedBitmapManager* GetSharedBitmapManager() override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
 
  private:
   ContextProviderFactoryImpl(
       gpu::GpuChannelEstablishFactory* gpu_channel_factory);
 
   scoped_refptr<cc::ContextProvider> CreateContextProviderInternal(
       command_buffer_metrics::ContextType context_type,
       gpu::SurfaceHandle surface_handle,
@@ skipping 21 matching lines @@
 
   scoped_refptr<cc::VulkanContextProvider> shared_vulkan_context_provider_;
 
   bool in_handle_pending_requests_;
 
   bool in_shutdown_;
 
   base::OneShotTimer establish_gpu_channel_timeout_;
 
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  int surface_client_id_;
+  uint32_t next_client_id_;
 
   base::WeakPtrFactory<ContextProviderFactoryImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextProviderFactoryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_CONTEXT_PROVIDER_FACTORY_IMPL_ANDROID_H_