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

media/renderers/mock_gpu_video_accelerator_factories.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 #define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
@@ skipping 21 matching lines @@
   MOCK_METHOD0(DoCreateVideoDecodeAccelerator, VideoDecodeAccelerator*());
   MOCK_METHOD0(DoCreateVideoEncodeAccelerator, VideoEncodeAccelerator*());
 
   MOCK_METHOD5(CreateTextures,
                bool(int32 count,
                     const gfx::Size& size,
                     std::vector<uint32>* texture_ids,
                     std::vector<gpu::Mailbox>* texture_mailboxes,
                     uint32 texture_target));
   MOCK_METHOD1(DeleteTexture, void(uint32 texture_id));
-  MOCK_METHOD1(WaitSyncPoint, void(uint32 sync_point));
+  MOCK_METHOD2(WaitSyncPoint,
+               void(uint32 sync_point, const gpu::SyncToken& sync_token));
   MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
   MOCK_METHOD0(GetVideoDecodeAcceleratorSupportedProfiles,
                VideoDecodeAccelerator::SupportedProfiles());
   MOCK_METHOD0(GetVideoEncodeAcceleratorSupportedProfiles,
                VideoEncodeAccelerator::SupportedProfiles());
 
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage) override;
@@ skipping 31 matching lines @@
   VideoPixelFormat video_frame_output_format_ = PIXEL_FORMAT_I420;
 
   bool fail_to_allocate_gpu_memory_buffer_ = false;
 
   gpu::gles2::GLES2Interface* gles2_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_