Modified old wait sync point functions to also accept new sync tokens.

ui/compositor/layer_unittest.cc

Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 7b96199ab56a4d59e1d4ee1e9542df8322b4ecb8..935bfa7f6f4ef06c2e69a84e8450755642a1c232 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -707,7 +707,7 @@ TEST_F(LayerWithNullDelegateTest, EscapedDebugNames) {
   EXPECT_EQ(name, roundtrip);
 }
 
-void ReturnMailbox(bool* run, uint32 sync_point, bool is_lost) {
+void ReturnMailbox(bool* run, const gpu::SyncToken& sync_token, bool is_lost) {
   *run = true;
 }
 
@@ -728,7 +728,7 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) {
   cc::Layer* before_layer = l1->cc_layer_for_testing();
 
   bool callback1_run = false;
-  cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), 0, 0);
+  cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback1_run)),
                         gfx::Size(10, 10));
@@ -744,7 +744,7 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) {
   EXPECT_FALSE(callback1_run);
 
   bool callback2_run = false;
-  mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), 0, 0);
+  mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback2_run)),
                         gfx::Size(10, 10));
@@ -765,7 +765,7 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) {
 
   // Back to a texture, without changing the bounds of the layer or the texture.
   bool callback3_run = false;
-  mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), 0, 0);
+  mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback3_run)),
                         gfx::Size(10, 10));