Replace usage of SurfaceId's client_id with FrameSinkId

ui/android/window_android_compositor.h

Index: ui/android/window_android_compositor.h
diff --git a/ui/android/window_android_compositor.h b/ui/android/window_android_compositor.h
index 75252ad671ce153c56fe85b9d9a5d136b5c8b01b..426ac3d6bee1bca301005ed84d0e6fe5086eff71 100644
--- a/ui/android/window_android_compositor.h
+++ b/ui/android/window_android_compositor.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "cc/output/copy_output_request.h"
+#include "cc/surfaces/frame_sink_id.h"
 #include "ui/android/ui_android_export.h"
 
 namespace cc {
@@ -30,7 +31,7 @@ class UI_ANDROID_EXPORT WindowAndroidCompositor {
                        base::TimeDelta vsync_period) = 0;
   virtual void SetNeedsAnimate() = 0;
   virtual ResourceManager& GetResourceManager() = 0;
-  virtual uint32_t GetSurfaceClientId() = 0;
+  virtual cc::FrameSinkId GetFrameSinkId() = 0;
 };
 
 }  // namespace ui