Update Surface ID Terminology

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 082d1621f2da1b878bfa32a46ea1dbfaf1aab734..a5349cd81eaa3ff8b31c7de051f97344311f0bd4 100644
--- a/cc/surfaces/display_scheduler_unittest.cc
+++ b/cc/surfaces/display_scheduler_unittest.cc
@@ -104,9 +104,9 @@ class DisplaySchedulerTest : public testing::Test {
 };
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
-  SurfaceId root_surface_id1(0, 1, 0);
-  SurfaceId root_surface_id2(0, 2, 0);
-  SurfaceId sid1(0, 3, 0);
+  SurfaceId root_surface_id1(0, 0, 1, 0);
+  SurfaceId root_surface_id2(0, 0, 2, 0);
+  SurfaceId sid1(0, 0, 3, 0);
   base::TimeTicks late_deadline;
 
   // Go trough an initial BeginFrame cycle with the root surface.
@@ -139,8 +139,8 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
 }
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
-  SurfaceId root_surface_id(0, 1, 0);
-  SurfaceId sid1(0, 2, 0);
+  SurfaceId root_surface_id(0, 0, 1, 0);
+  SurfaceId sid1(0, 0, 2, 0);
   base::TimeTicks late_deadline;
 
   // Go trough an initial BeginFrame cycle with the root surface.
@@ -173,9 +173,9 @@ TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
 }
 
 TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
-  SurfaceId root_surface_id(0, 0, 0);
-  SurfaceId sid1(0, 1, 0);
-  SurfaceId sid2(0, 2, 0);
+  SurfaceId root_surface_id(0, 0, 0, 0);
+  SurfaceId sid1(0, 0, 1, 0);
+  SurfaceId sid2(0, 0, 2, 0);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
@@ -237,8 +237,8 @@ TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
 }
 
 TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
-  SurfaceId root_surface_id(0, 0, 0);
-  SurfaceId sid1(0, 1, 0);
+  SurfaceId root_surface_id(0, 0, 0, 0);
+  SurfaceId sid1(0, 0, 1, 0);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
@@ -268,8 +268,8 @@ TEST_F(DisplaySchedulerTest, OutputSurfaceLost) {
 }
 
 TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
-  SurfaceId root_surface_id(0, 0, 0);
-  SurfaceId sid1(0, 1, 0);
+  SurfaceId root_surface_id(0, 0, 0, 0);
+  SurfaceId sid1(0, 0, 1, 0);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
@@ -291,8 +291,8 @@ TEST_F(DisplaySchedulerTest, ResizeCausesSwap) {
 }
 
 TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
-  SurfaceId root_surface_id(0, 0, 0);
-  SurfaceId sid1(0, 1, 0);
+  SurfaceId root_surface_id(0, 0, 0, 0);
+  SurfaceId sid1(0, 0, 1, 0);
   base::TimeTicks late_deadline;
 
   // Set the root surface
@@ -337,9 +337,9 @@ TEST_F(DisplaySchedulerTest, RootSurfaceResourcesLocked) {
 }
 
 TEST_F(DisplaySchedulerTest, DidSwapBuffers) {
-  SurfaceId root_surface_id(0, 0, 0);
-  SurfaceId sid1(0, 1, 0);
-  SurfaceId sid2(0, 2, 0);
+  SurfaceId root_surface_id(0, 0, 0, 0);
+  SurfaceId sid1(0, 0, 1, 0);
+  SurfaceId sid2(0, 0, 2, 0);
 
   // Set the root surface
   scheduler_.SetNewRootSurface(root_surface_id);
@@ -402,8 +402,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(0, 1, 0);
-  SurfaceId sid1(0, 2, 0);
+  SurfaceId root_surface_id(0, 0, 1, 0);
+  SurfaceId sid1(0, 0, 2, 0);
   int count = 1;
   EXPECT_EQ(count++, scheduler_.scheduler_begin_frame_deadline_count());