Replace usage of SurfaceId's client_id with FrameSinkId

ui/android/context_provider_factory.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 UI_ANDROID_CONTEXT_PROVIDER_FACTORY_H_
 #define UI_ANDROID_CONTEXT_PROVIDER_FACTORY_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "cc/surfaces/frame_sink_id.h"
 #include "ui/android/ui_android_export.h"
 
 namespace cc {
 class ContextProvider;
 class GpuMemoryBufferManager;
 class VulkanContextProvider;
 class SharedBitmapManager;
 class SurfaceManager;
 }
 
@@ skipping 53 matching lines @@
       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) = 0;
 
   virtual cc::SurfaceManager* GetSurfaceManager() = 0;
 
-  virtual uint32_t AllocateSurfaceClientId() = 0;
+  virtual cc::FrameSinkId AllocateFrameSinkId() = 0;
 
   virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;
 
   virtual gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() = 0;
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_CONTEXT_PROVIDER_FACTORY_H_