Converted video frame and image callbacks to use new sync tokens.

content/common/gpu/gpu_channel_manager.h

Index: content/common/gpu/gpu_channel_manager.h
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 19cec9df08fae35bda606503c02163fe9b6f1b9b..c3e889a27e2cc78ba23699342e6c3967c8653367 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -34,7 +34,9 @@ class GLShareGroup;
 
 namespace gpu {
 class PreemptionFlag;
+class SyncPointClientWaiter;
 class SyncPointManager;
+struct SyncToken;
 union ValueState;
 namespace gles2 {
 class FramebufferCompletenessCache;
@@ -156,7 +158,7 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id, int client_id);
   void OnDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                                 int client_id,
-                                int32 sync_point);
+                                const gpu::SyncToken& sync_token);
 
   void OnUpdateValueState(int client_id,
                           unsigned int target,
@@ -182,6 +184,7 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   GpuMemoryManager gpu_memory_manager_;
   // SyncPointManager guaranteed to outlive running MessageLoop.
   gpu::SyncPointManager* sync_point_manager_;
+  scoped_ptr<gpu::SyncPointClientWaiter> sync_point_client_waiter_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gpu::gles2::FramebufferCompletenessCache>