Reusing base::IdType<...> to implement SurfaceId.

cc/surfaces/display_scheduler_unittest.cc

Index: cc/surfaces/display_scheduler_unittest.cc
diff --git a/cc/surfaces/display_scheduler_unittest.cc b/cc/surfaces/display_scheduler_unittest.cc
index 0f2725dbc713d64c2b72f77a51a33875a0bf802a..7349394008a4b5b0d7d3f6649e0d28aa651e6e7b 100644
--- a/cc/surfaces/display_scheduler_unittest.cc
+++ b/cc/surfaces/display_scheduler_unittest.cc
@@ -108,9 +108,9 @@ class DisplaySchedulerTest : public testing::Test {
 };
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
-  SurfaceId root_surface_id1(1);
-  SurfaceId root_surface_id2(2);
-  SurfaceId sid1(3);
+  SurfaceId root_surface_id1 = SurfaceId::FromUnsafeValue(1);
+  SurfaceId root_surface_id2 = SurfaceId::FromUnsafeValue(2);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(3);
   base::TimeTicks late_deadline;
 
   // Go trough an initial BeginFrame cycle with the root surface.
@@ -143,8 +143,8 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
 }
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
-  SurfaceId root_surface_id(1);
-  SurfaceId sid1(2);
+  SurfaceId root_surface_id = SurfaceId::FromUnsafeValue(1);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(2);
   base::TimeTicks late_deadline;
 
   // Go trough an initial BeginFrame cycle with the root surface.
@@ -177,9 +177,9 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
 }
 
 TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
-  SurfaceId root_surface_id(0);
-  SurfaceId sid1(1);
-  SurfaceId sid2(2);
+  SurfaceId root_surface_id = SurfaceId::FromUnsafeValue(0);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(1);
+  SurfaceId sid2 = SurfaceId::FromUnsafeValue(2);
 
   // Set the root surface
   scheduler_->SetNewRootSurface(root_surface_id);
@@ -241,7 +241,7 @@ TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
 }
 
 TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
-  SurfaceId sid1(1);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(1);
 
   // DrawAndSwap normally.
   BeginFrameForTest();
@@ -268,7 +268,7 @@ TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
 }
 
 TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
-  SurfaceId sid1(1);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(1);
 
   // DrawAndSwap normally.
   BeginFrameForTest();
@@ -287,7 +287,7 @@ TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
 }
 
 TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
-  SurfaceId sid1(1);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(1);
   base::TimeTicks late_deadline;
 
   // DrawAndSwap normally.
@@ -328,8 +328,8 @@ TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
 }
 
 TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
-  SurfaceId sid1(1);
-  SurfaceId sid2(2);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(1);
+  SurfaceId sid2 = SurfaceId::FromUnsafeValue(2);
 
   // Get scheduler to detect surface 1 and 2 as active.
   BeginFrameForTest();
@@ -389,8 +389,8 @@ TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
 // This test verfies that we try to reschedule the deadline
 // after any event that may change what deadline we want.
 TEST_F(DisplaySchedulerTest, ScheduleBeginFrameDeadline) {
-  SurfaceId root_surface_id(1);
-  SurfaceId sid1(2);
+  SurfaceId root_surface_id = SurfaceId::FromUnsafeValue(1);
+  SurfaceId sid1 = SurfaceId::FromUnsafeValue(2);
   int count = 1;
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());