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

content/browser/gpu/gpu_process_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 22 matching lines @@
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "content/common/mac/io_surface_manager_token.h"
 #endif
 
 struct GPUCreateCommandBufferConfig;
 
 namespace IPC {
 struct ChannelHandle;
 }
 
-namespace gpu {
-struct SyncToken;
-}
-
 namespace content {
 class BrowserChildProcessHostImpl;
 class GpuMainThread;
 class InProcessChildThreadParams;
 class MojoApplicationHost;
 class RenderWidgetHostViewFrameSubscriber;
 class ShaderDiskCache;
 
 typedef base::Thread* (*GpuMainThreadFactoryFunction)(
     const InProcessChildThreadParams&);
@@ skipping 88 matching lines @@
       const gfx::GpuMemoryBufferHandle& handle,
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       int client_id,
       const CreateGpuMemoryBufferCallback& callback);
 
   // Tells the GPU process to destroy GPU memory buffer.
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
-                              const gpu::SyncToken& sync_token);
+                              int sync_point);
 
   // What kind of GPU process, e.g. sandboxed or unsandboxed.
   GpuProcessKind kind();
 
   // Forcefully terminates the GPU process.
   void ForceShutdown();
 
   // Asks the GPU process to stop by itself.
   void StopGpuProcess();
 
@@ skipping 133 matching lines @@
   // Browser-side Mojo endpoint which sets up a Mojo channel with the child
   // process and contains the browser's ServiceRegistry.
   scoped_ptr<MojoApplicationHost> mojo_application_host_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_