Merge the IPCs used for GPU process synchronization.

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 2a38d0c756e43445eb22719b91988fa3ce492ab2..6bc0840611739f4e1b95f1dad58a61d78913094a 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1241,7 +1241,7 @@ void RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped(
   TRACE_EVENT0("renderer_host",
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped");
   if (!view_) {
-    RenderWidgetHostImpl::AcknowledgeSwapBuffers(route_id,
+    RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_process_host_id);
     return;
   }
@@ -1848,19 +1848,11 @@ bool RenderWidgetHostImpl::GotResponseToLockMouseRequest(bool allowed) {
 }
 
 // static
-void RenderWidgetHostImpl::AcknowledgeSwapBuffers(int32 route_id,
-                                                  int gpu_host_id) {
-  GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(gpu_host_id);
-  if (ui_shim)
-    ui_shim->Send(new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id));
-}
-
-// static
-void RenderWidgetHostImpl::AcknowledgePostSubBuffer(int32 route_id,
+void RenderWidgetHostImpl::AcknowledgeBufferPresent(int32 route_id,
                                                     int gpu_host_id) {
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(gpu_host_id);
   if (ui_shim)
-    ui_shim->Send(new AcceleratedSurfaceMsg_PostSubBufferACK(route_id));
+    ui_shim->Send(new AcceleratedSurfaceMsg_BufferPresented(route_id));
 }
 
 void RenderWidgetHostImpl::DelayedAutoResized() {