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

cc/test/render_pass_test_utils.cc

Index: cc/test/render_pass_test_utils.cc
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index 5a120ed6ba5e2ced5b8312fb02f38c46bb1e4422..f65ff073b6930bd900358d7bf87ecd14d71cb560 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -143,21 +143,21 @@ void AddRenderPassQuad(RenderPass* to_pass,
                FilterOperations());
 }
 
-static void EmptyReleaseCallback(uint32 sync_point,
+static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
                                  bool lost_resource,
                                  BlockingTaskRunner* main_thread_task_runner) {}
 
 void AddOneOfEveryQuadType(RenderPass* to_pass,
                            ResourceProvider* resource_provider,
                            RenderPassId child_pass,
-                           uint32_t* sync_point_for_mailbox_texture_quad) {
+                           uint32_t* sync_point_for_mailbox_texture) {
   gfx::Rect rect(0, 0, 100, 100);
   gfx::Rect opaque_rect(10, 10, 80, 80);
   gfx::Rect visible_rect(0, 0, 100, 100);
   const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
 
-  static const uint32_t kSyncPointForMailboxTextureQuad = 30;
-  *sync_point_for_mailbox_texture_quad = kSyncPointForMailboxTextureQuad;
+  static const uint32_t kSyncTokenForMailboxTextureQuad = 30;
+  *sync_point_for_mailbox_texture = kSyncTokenForMailboxTextureQuad;
 
   ResourceId resource1 = resource_provider->CreateResource(
       gfx::Size(45, 5), ResourceProvider::TEXTURE_HINT_IMMUTABLE,
@@ -194,8 +194,8 @@ void AddOneOfEveryQuadType(RenderPass* to_pass,
   memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
   scoped_ptr<SingleReleaseCallbackImpl> callback =
       SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
-  TextureMailbox mailbox(gpu_mailbox, target,
-                         *sync_point_for_mailbox_texture_quad);
+  TextureMailbox mailbox(
+      gpu_mailbox, gpu::SyncToken(*sync_point_for_mailbox_texture), target);
   ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
       mailbox, callback.Pass());
   resource_provider->AllocateForTesting(resource8);