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..7b69546d67907e223f909b86bb25017d53a23a07 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -144,6 +144,7 @@ void AddRenderPassQuad(RenderPass* to_pass,
 }
 
 static void EmptyReleaseCallback(uint32 sync_point,
+                                 const gpu::SyncToken& sync_token,
                                  bool lost_resource,
                                  BlockingTaskRunner* main_thread_task_runner) {}
 
@@ -195,7 +196,8 @@ void AddOneOfEveryQuadType(RenderPass* to_pass,
   scoped_ptr<SingleReleaseCallbackImpl> callback =
       SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
   TextureMailbox mailbox(gpu_mailbox, target,
-                         *sync_point_for_mailbox_texture_quad);
+                         *sync_point_for_mailbox_texture_quad,
+                         gpu::SyncToken());
   ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
       mailbox, callback.Pass());
   resource_provider->AllocateForTesting(resource8);