Merge the IPCs used for GPU process synchronization.

content/browser/gpu/gpu_process_host.cc

 // 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.
 
 #include "content/browser/gpu/gpu_process_host.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 86 matching lines @@
   }
 }
 
 void AcceleratedSurfaceBuffersSwappedCompleted(int host_id,
                                                int route_id,
                                                bool alive) {
   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     GpuProcessHost* host = GpuProcessHost::FromID(host_id);
     if (host) {
       if (alive)
-        host->Send(new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id));
+        host->Send(new AcceleratedSurfaceMsg_BufferPresented(route_id));
       else {
         host->ForceShutdown();
       }
     }
   } else {
     BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AcceleratedSurfaceBuffersSwappedCompleted,
                  host_id,
@@ skipping 700 matching lines @@
     const IPC::ChannelHandle& channel_handle,
     base::ProcessHandle renderer_process_for_gpu,
     const content::GPUInfo& gpu_info) {
   callback.Run(channel_handle, gpu_info);
 }
 
 void GpuProcessHost::CreateCommandBufferError(
     const CreateCommandBufferCallback& callback, int32 route_id) {
   callback.Run(route_id);
 }