Replace usage of SurfaceId's client_id with FrameSinkId

ui/compositor/compositor_unittest.cc

 // Copyright 2015 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.
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/begin_frame_args.h"
@@ skipping 10 matching lines @@
 #include "ui/compositor/test/draw_waiter_for_test.h"
 
 using testing::Mock;
 using testing::_;
 
 namespace ui {
 namespace {
 
 class FakeCompositorFrameSink : public cc::SurfaceFactoryClient {
  public:
-  FakeCompositorFrameSink(uint32_t client_id, cc::SurfaceManager* manager)
-      : client_id_(client_id),
+  FakeCompositorFrameSink(const cc::FrameSinkId& frame_sink_id,
+                          cc::SurfaceManager* manager)
+      : frame_sink_id_(frame_sink_id),
         manager_(manager),
         source_(nullptr),
         factory_(manager, this) {
-    manager_->RegisterSurfaceClientId(client_id_);
-    manager_->RegisterSurfaceFactoryClient(client_id_, this);
+    manager_->RegisterFrameSinkId(frame_sink_id_);
+    manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   }
 
   ~FakeCompositorFrameSink() override {
-    manager_->UnregisterSurfaceFactoryClient(client_id_);
-    manager_->InvalidateSurfaceClientId(client_id_);
+    manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
+    manager_->InvalidateFrameSinkId(frame_sink_id_);
   }
 
   void ReturnResources(const cc::ReturnedResourceArray& resources) override {}
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override {
     DCHECK(!source_ || !begin_frame_source);
     source_ = begin_frame_source;
   };
 
  private:
-  const uint32_t client_id_;
+  const cc::FrameSinkId frame_sink_id_;
   cc::SurfaceManager* const manager_;
   cc::BeginFrameSource* source_;
   cc::SurfaceFactory factory_;
 };
 
 ACTION_P2(RemoveObserver, compositor, observer) {
   compositor->RemoveBeginFrameObserver(observer);
 }
 
 // Test fixture for tests that require a ui::Compositor with a real task
@@ skipping 85 matching lines @@
   EXPECT_EQ(gfx::kNullAcceleratedWidget,
             compositor()->ReleaseAcceleratedWidget());
   compositor()->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
   compositor()->SetVisible(true);
   compositor()->ScheduleDraw();
   DrawWaiterForTest::WaitForCompositingEnded(compositor());
   compositor()->SetRootLayer(nullptr);
 }
 
 }  // namespace ui