Make cc::SurfaceId unguessable

cc/surfaces/surface_unittest.cc

Index: cc/surfaces/surface_unittest.cc
diff --git a/cc/surfaces/surface_unittest.cc b/cc/surfaces/surface_unittest.cc
index 03ffc3a920b83e25434a847e8223a4d4538a0d6a..8dd50c813bf9edbac945b0d311053beb0619593a 100644
--- a/cc/surfaces/surface_unittest.cc
+++ b/cc/surfaces/surface_unittest.cc
@@ -35,7 +35,7 @@ TEST(SurfaceTest, SurfaceLifetime) {
   FakeSurfaceFactoryClient surface_factory_client;
   SurfaceFactory factory(&manager, &surface_factory_client);
 
-  SurfaceId surface_id(6);
+  SurfaceId surface_id(0, 6);
   {
     factory.Create(surface_id);
     EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
@@ -51,10 +51,10 @@ TEST(SurfaceTest, SurfaceIds) {
     uint32_t id_namespace = namespaces[i];
     SurfaceIdAllocator allocator(id_namespace);
     SurfaceId id1 = allocator.GenerateId();
-    EXPECT_EQ(id1.id_namespace(), id_namespace);
+    EXPECT_EQ(id1.id_namespace, id_namespace);
     SurfaceId id2 = allocator.GenerateId();
-    EXPECT_EQ(id2.id_namespace(), id_namespace);
-    EXPECT_NE(id1.id, id2.id);
+    EXPECT_EQ(id2.id_namespace, id_namespace);
+    EXPECT_NE(id1.local_id, id2.local_id);
   }
 }