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

content/common/gpu/client/gpu_memory_buffer_impl.h

Index: content/common/gpu/client/gpu_memory_buffer_impl.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h
index a3ba3f5a510f8a6f25f3ec5ae75f062ae756462a..44b528e82662f85d423ee4790ac546a30ea1eebc 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.h
@@ -8,7 +8,6 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "gpu/command_buffer/common/sync_token.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
@@ -17,7 +16,7 @@
 // Provides common implementation of a GPU memory buffer.
 class CONTENT_EXPORT GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
  public:
-  typedef base::Callback<void(const gpu::SyncToken& sync)> DestructionCallback;
+  typedef base::Callback<void(uint32 sync_point)> DestructionCallback;
 
   ~GpuMemoryBufferImpl() override;
 
@@ -41,8 +40,8 @@
   gfx::GpuMemoryBufferId GetId() const override;
   ClientBuffer AsClientBuffer() override;
 
-  void set_destruction_sync_token(const gpu::SyncToken& sync_token) {
-    destruction_sync_token_ = sync_token;
+  void set_destruction_sync_point(uint32 sync_point) {
+    destruction_sync_point_ = sync_point;
   }
 
  protected:
@@ -56,7 +55,7 @@
   const gfx::BufferFormat format_;
   const DestructionCallback callback_;
   bool mapped_;
-  gpu::SyncToken destruction_sync_token_;
+  uint32 destruction_sync_point_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);