Revert of Decouple browser-specific GPU IPC messages from GPU service IPCs

content/browser/gpu/gpu_process_host_ui_shim.h

Index: content/browser/gpu/gpu_process_host_ui_shim.h
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index 4358b1c6825189e1a0f1bf3d532c3b54dbde00bd..e37eda0545e00c4082ba2f28bbfa80e25b741678 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -27,6 +27,10 @@
 #include "ipc/ipc_sender.h"
 #include "ipc/message_router.h"
 
+#if defined(OS_MACOSX)
+struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
+#endif
+
 namespace ui {
 class LatencyInfo;
 }
@@ -40,9 +44,6 @@
 }
 
 namespace content {
-#if defined(OS_MACOSX)
-struct AcceleratedSurfaceBuffersSwappedParams;
-#endif
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg);
 
 class GpuProcessHostUIShim : public IPC::Listener,
@@ -97,7 +98,7 @@
 
 #if defined(OS_MACOSX)
   void OnAcceleratedSurfaceBuffersSwapped(
-      const AcceleratedSurfaceBuffersSwappedParams& params);
+      const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params);
 #endif
   void OnVideoMemoryUsageStatsReceived(
       const GPUVideoMemoryUsageStats& video_memory_usage_stats);