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

content/common/gpu/client/gpu_memory_buffer_impl.cc

 // 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.
 
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 #include "base/logging.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 
 #if defined(OS_MACOSX)
@@ skipping 11 matching lines @@
 namespace content {
 
 GpuMemoryBufferImpl::GpuMemoryBufferImpl(gfx::GpuMemoryBufferId id,
                                          const gfx::Size& size,
                                          gfx::BufferFormat format,
                                          const DestructionCallback& callback)
     : id_(id),
       size_(size),
       format_(format),
       callback_(callback),
-      mapped_(false) {}
+      mapped_(false),
+      destruction_sync_point_(0) {}
 
 GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {
   DCHECK(!mapped_);
-  callback_.Run(destruction_sync_token_);
+  callback_.Run(destruction_sync_point_);
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     const DestructionCallback& callback) {
   switch (handle.type) {
@@ skipping 37 matching lines @@
 
 gfx::GpuMemoryBufferId GpuMemoryBufferImpl::GetId() const {
   return id_;
 }
 
 ClientBuffer GpuMemoryBufferImpl::AsClientBuffer() {
   return reinterpret_cast<ClientBuffer>(this);
 }
 
 }  // namespace content