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..d4ac06e8f464cc4a57e3a99c34c906de31eaf20e 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, 0);
   {
     factory.Create(surface_id);
     EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
@@ -54,7 +54,8 @@ TEST(SurfaceTest, SurfaceIds) {
     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_NE(id1.local_id(), id2.local_id());
+    EXPECT_NE(id1.nonce(), id2.nonce());
   }
 }