Merge the IPCs used for GPU process synchronization.

content/common/gpu/image_transport_surface_win.cc

Index: content/common/gpu/image_transport_surface_win.cc
diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc
index 33a638ac9400b7aac25f229c60bfd44318240630..a65f6699874c22fde0a3c6010a19d688b2a5c297 100644
--- a/content/common/gpu/image_transport_surface_win.cc
+++ b/content/common/gpu/image_transport_surface_win.cc
@@ -47,8 +47,7 @@ class PbufferImageTransportSurface
   // ImageTransportSurface implementation
   virtual void OnNewSurfaceACK(uint64 surface_handle,
                                TransportDIB::Handle shm_handle) OVERRIDE;
-  virtual void OnBuffersSwappedACK() OVERRIDE;
-  virtual void OnPostSubBufferACK() OVERRIDE;
+  virtual void OnBufferPresented() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
@@ -173,14 +172,10 @@ void PbufferImageTransportSurface::SendBuffersSwapped() {
   helper_->SetScheduled(false);
 }
 
-void PbufferImageTransportSurface::OnBuffersSwappedACK() {
+void PbufferImageTransportSurface::OnBufferPresented() {
   helper_->SetScheduled(true);
 }
 
-void PbufferImageTransportSurface::OnPostSubBufferACK() {
-  NOTREACHED();
-}
-
 void PbufferImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle shm_handle) {