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

content/common/child_process_host_impl.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_COMMON_CHILD_PROCESS_HOST_IMPL_H_
 #define CONTENT_COMMON_CHILD_PROCESS_HOST_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace IPC {
 class MessageFilter;
 }
 
-namespace gpu {
-struct SyncToken;
-}
-
 namespace content {
 class ChildProcessHostDelegate;
 
 // Provides common functionality for hosting a child process and processing IPC
 // messages between the host and the child process. Users are responsible
 // for the actual launching and terminating of the child processes.
 class CONTENT_EXPORT ChildProcessHostImpl : public ChildProcessHost,
                                             public IPC::Listener {
  public:
   ~ChildProcessHostImpl() override;
@@ skipping 53 matching lines @@
   void OnShutdownRequest();
   void OnAllocateSharedMemory(uint32 buffer_size,
                               base::SharedMemoryHandle* handle);
   void OnAllocateGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                                  uint32 width,
                                  uint32 height,
                                  gfx::BufferFormat format,
                                  gfx::BufferUsage usage,
                                  gfx::GpuMemoryBufferHandle* handle);
   void OnDeletedGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
-                                const gpu::SyncToken& sync_token);
+                                uint32 sync_point);
 
   ChildProcessHostDelegate* delegate_;
   base::Process peer_process_;
   bool opening_channel_;  // True while we're waiting the channel to be opened.
   scoped_ptr<IPC::Channel> channel_;
   std::string channel_id_;
 
   // Holds all the IPC message filters.  Since this object lives on the IO
   // thread, we don't have a IPC::ChannelProxy and so we manage filters
   // manually.
   std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CHILD_PROCESS_HOST_IMPL_H_