Replace usage of SurfaceId's client_id with FrameSinkId

cc/surfaces/surfaces_pixeltest.cc

Index: cc/surfaces/surfaces_pixeltest.cc
diff --git a/cc/surfaces/surfaces_pixeltest.cc b/cc/surfaces/surfaces_pixeltest.cc
index a52964cca627c040e4965a0288da2b79fc365e7a..5409f1b20255f5f28f2e9dc85730504455d3d271 100644
--- a/cc/surfaces/surfaces_pixeltest.cc
+++ b/cc/surfaces/surfaces_pixeltest.cc
@@ -21,7 +21,7 @@
 namespace cc {
 namespace {
 
-static constexpr uint32_t kArbitraryClientId = 1u;
+static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 
 class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
  public:
@@ -32,7 +32,7 @@ class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
 class SurfacesPixelTest : public RendererPixelTest<GLRenderer> {
  public:
   SurfacesPixelTest()
-      : allocator_(kArbitraryClientId), factory_(&manager_, &client_) {}
+      : allocator_(kArbitraryFrameSinkId), factory_(&manager_, &client_) {}
 
  protected:
   SurfaceManager manager_;