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

media/renderers/skcanvas_video_renderer_unittest.cc

 // Copyright (c) 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 "base/message_loop/message_loop.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface_stub.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
@@ skipping 449 matching lines @@
 }
 
 namespace {
 class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
  public:
   void GenTextures(GLsizei n, GLuint* textures) override {
     DCHECK_EQ(1, n);
     *textures = 1;
   }
 };
-void MailboxHoldersReleased(uint32 sync_point) {}
+void MailboxHoldersReleased(const gpu::SyncToken& sync_token) {}
 }  // namespace
 
 // Test that SkCanvasVideoRendererTest::Paint doesn't crash when GrContext is
 // abandoned.
 TEST_F(SkCanvasVideoRendererTest, ContextLost) {
   skia::RefPtr<const GrGLInterface> null_interface =
       skia::AdoptRef(GrGLCreateNullInterface());
   auto gr_context = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend,
       reinterpret_cast<GrBackendContext>(null_interface.get())));
   gr_context->abandonContext();
 
   SkCanvas canvas(AllocBitmap(kWidth, kHeight));
 
   TestGLES2Interface gles2;
   Context3D context_3d(&gles2, gr_context.get());
   gfx::Size size(kWidth, kHeight);
   gpu::MailboxHolder mailbox(gpu::Mailbox::Generate(), GL_TEXTURE_RECTANGLE_ARB,
                              0);
   auto video_frame = VideoFrame::WrapNativeTexture(
       PIXEL_FORMAT_UYVY, mailbox, base::Bind(MailboxHoldersReleased), size,
       gfx::Rect(size), size, kNoTimestamp());
 
   renderer_.Paint(video_frame, &canvas, kNaturalRect, 0xFF,
                   SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_90, context_3d);
 }
 }  // namespace media