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

cc/surfaces/display_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 "cc/surfaces/display.h"
 
 #include <utility>
 
 #include "base/test/null_task_runner.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 148 matching lines @@
   SetUpContext(nullptr);
   TestDisplayClient client;
   RendererSettings settings;
   Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
                   settings);
 
   TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
                                  task_runner_.get());
   display.Initialize(std::move(output_surface_), &scheduler);
 
-  SurfaceId surface_id(6);
+  SurfaceId surface_id = SurfaceId::FromUnsafeValue(6);
   factory_.Create(surface_id);
   Surface* surface = manager_.GetSurfaceForId(surface_id);
 
   EXPECT_EQ(nullptr, surface_factory_client_.begin_frame_source());
   display.AddSurface(surface);
   EXPECT_NE(nullptr, surface_factory_client_.begin_frame_source());
   display.RemoveSurface(surface);
   EXPECT_EQ(nullptr, surface_factory_client_.begin_frame_source());
 }
 
 // Check that frame is damaged and swapped only under correct conditions.
 TEST_F(DisplayTest, DisplayDamaged) {
   SetUpContext(nullptr);
   TestDisplayClient client;
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
   Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
                   settings);
 
   TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
                                  task_runner_.get());
   display.Initialize(std::move(output_surface_), &scheduler);
 
-  SurfaceId surface_id(7u);
+  SurfaceId surface_id = SurfaceId::FromUnsafeValue(7u);
   EXPECT_FALSE(scheduler.damaged);
   EXPECT_FALSE(scheduler.has_new_root_surface);
   display.SetSurfaceId(surface_id, 1.f);
   EXPECT_FALSE(scheduler.damaged);
   EXPECT_FALSE(scheduler.display_resized_);
   EXPECT_TRUE(scheduler.has_new_root_surface);
 
   scheduler.ResetDamageForTest();
   display.Resize(gfx::Size(100, 100));
   EXPECT_FALSE(scheduler.damaged);
@@ skipping 236 matching lines @@
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
   Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
                   settings);
 
   TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
                                  task_runner_.get());
   display.Initialize(std::move(output_surface_), &scheduler);
 
-  SurfaceId surface_id(7u);
+  SurfaceId surface_id = SurfaceId::FromUnsafeValue(7u);
   display.SetSurfaceId(surface_id, 1.f);
 
   display.Resize(gfx::Size(100, 100));
   factory_.Create(surface_id);
 
   {
     RenderPassList pass_list;
     scoped_ptr<RenderPass> pass = RenderPass::Create();
     pass->output_rect = gfx::Rect(0, 0, 100, 100);
     pass->damage_rect = gfx::Rect(10, 10, 1, 1);
@@ skipping 35 matching lines @@
 
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM());
   display.Resize(gfx::Size(250, 250));
   testing::Mock::VerifyAndClearExpectations(context_ptr);
 
   factory_.Destroy(surface_id);
 }
 
 }  // namespace
 }  // namespace cc