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

cc/test/render_pass_test_utils.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/render_pass_test_utils.h"
 
 #include "base/bind.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 125 matching lines @@
                output_rect,
                contributing_pass->id,
                mask_resource_id,
                gfx::Vector2dF(1.f, 1.f),
                arbitrary_nonzero_size,
                filters,
                gfx::Vector2dF(),
                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,
       resource_provider->best_texture_format());
   resource_provider->AllocateForTesting(resource1);
   ResourceId resource2 = resource_provider->CreateResource(
       gfx::Size(346, 61), ResourceProvider::TEXTURE_HINT_IMMUTABLE,
       resource_provider->best_texture_format());
   resource_provider->AllocateForTesting(resource2);
   ResourceId resource3 = resource_provider->CreateResource(
@@ skipping 16 matching lines @@
   ResourceId resource7 = resource_provider->CreateResource(
       gfx::Size(9, 14), ResourceProvider::TEXTURE_HINT_IMMUTABLE,
       resource_provider->best_texture_format());
   resource_provider->AllocateForTesting(resource7);
 
   unsigned target = GL_TEXTURE_2D;
   gpu::Mailbox gpu_mailbox;
   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);
 
   SharedQuadState* shared_state = to_pass->CreateAndAppendSharedQuadState();
   shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1,
                        SkXfermode::kSrcOver_Mode, 0);
 
   DebugBorderDrawQuad* debug_border_quad =
       to_pass->CreateAndAppendDrawQuad<DebugBorderDrawQuad>();
@@ skipping 83 matching lines @@
   YUVVideoDrawQuad* yuv_quad =
       to_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
   yuv_quad->SetNew(shared_state2, rect, opaque_rect, visible_rect,
                    gfx::RectF(.0f, .0f, 100.0f, 100.0f),
                    gfx::RectF(.0f, .0f, 50.0f, 50.0f), gfx::Size(100, 100),
                    gfx::Size(50, 50), plane_resources[0], plane_resources[1],
                    plane_resources[2], plane_resources[3], color_space);
 }
 
 }  // namespace cc