Replace usage of SurfaceId's client_id with FrameSinkId

ui/android/context_provider_factory.h

Index: ui/android/context_provider_factory.h
diff --git a/ui/android/context_provider_factory.h b/ui/android/context_provider_factory.h
index d0505894530f80132d240b996409eef5b001ec85..294f101c0fb528e75969d0d795b1f473a7b32b79 100644
--- a/ui/android/context_provider_factory.h
+++ b/ui/android/context_provider_factory.h
@@ -7,6 +7,7 @@
 
 #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 {
@@ -80,7 +81,7 @@ class UI_ANDROID_EXPORT ContextProviderFactory {
 
   virtual cc::SurfaceManager* GetSurfaceManager() = 0;
 
-  virtual uint32_t AllocateSurfaceClientId() = 0;
+  virtual cc::FrameSinkId AllocateFrameSinkId() = 0;
 
   virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;