Decouple browser-specific GPU IPC messages from GPU service IPCs

content/common/gpu/image_transport_surface.h

Index: content/common/gpu/image_transport_surface.h
diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h
index d432708cf2da0dfca74c6df282b591c94ad2da56..130d5cb436bad29c5f3adb44f70ce4fa83e9d8a3 100644
--- a/content/common/gpu/image_transport_surface.h
+++ b/content/common/gpu/image_transport_surface.h
@@ -26,10 +26,6 @@
 #include "ui/gfx/swap_result.h"
 #include "ui/gl/gl_surface.h"
 
-#if defined(OS_MACOSX)
-struct AcceleratedSurfaceMsg_BufferPresented_Params;
-struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
-#endif
 
 namespace gfx {
 class GLSurface;
@@ -45,6 +41,10 @@ class GLES2Decoder;
 namespace content {
 class GpuChannelManager;
 class GpuCommandBufferStub;
+#if defined(OS_MACOSX)
+struct BufferPresentedParams;
+struct AcceleratedSurfaceBuffersSwappedParams;
+#endif
 
 // The GPU process is agnostic as to how it displays results. On some platforms
 // it renders directly to window. On others it renders offscreen and transports
@@ -64,8 +64,7 @@ class ImageTransportSurface {
   ImageTransportSurface();
 
 #if defined(OS_MACOSX)
-  virtual void OnBufferPresented(
-      const AcceleratedSurfaceMsg_BufferPresented_Params& params) = 0;
+  virtual void BufferPresented(const BufferPresentedParams& params) = 0;
 #endif
   virtual void SetLatencyInfo(
       const std::vector<ui::LatencyInfo>& latency_info) = 0;
@@ -104,26 +103,23 @@ class ImageTransportSurface {
 };
 
 class ImageTransportHelper
-    : public IPC::Listener,
-      public base::SupportsWeakPtr<ImageTransportHelper> {
+    : public base::SupportsWeakPtr<ImageTransportHelper> {
  public:
   // Takes weak pointers to objects that outlive the helper.
   ImageTransportHelper(ImageTransportSurface* surface,
                        GpuChannelManager* manager,
                        GpuCommandBufferStub* stub,
                        gfx::PluginWindowHandle handle);
-  ~ImageTransportHelper() override;
+  ~ImageTransportHelper();
 
   bool Initialize(gfx::GLSurface::Format format);
 
-  // IPC::Listener implementation:
-  bool OnMessageReceived(const IPC::Message& message) override;
-
   // Helper send functions. Caller fills in the surface specific params
   // like size and surface id. The helper fills in the rest.
 #if defined(OS_MACOSX)
+  void BufferPresented(const BufferPresentedParams& params);
   void SendAcceleratedSurfaceBuffersSwapped(
-      GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params);
+      AcceleratedSurfaceBuffersSwappedParams params);
 #endif
 
   // Make the surface's context current.
@@ -138,12 +134,6 @@ class ImageTransportHelper
  private:
   gpu::gles2::GLES2Decoder* Decoder();
 
-  // IPC::Message handlers.
-#if defined(OS_MACOSX)
-  void OnBufferPresented(
-      const AcceleratedSurfaceMsg_BufferPresented_Params& params);
-#endif
-
   // Backbuffer resize callback.
   void Resize(gfx::Size size, float scale_factor);
 
@@ -188,8 +178,7 @@ class PassThroughImageTransportSurface
 
   // ImageTransportSurface implementation.
 #if defined(OS_MACOSX)
-  void OnBufferPresented(
-      const AcceleratedSurfaceMsg_BufferPresented_Params& params) override;
+  void BufferPresented(const BufferPresentedParams& params) override;
 #endif
   gfx::Size GetSize() override;
   void SetLatencyInfo(