Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats

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 32768337dc27239bf1d8f24889f5c86feb6ff6f8..e37eda0545e00c4082ba2f28bbfa80e25b741678 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -21,8 +21,8 @@
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "gpu/config/gpu_info.h"
-#include "gpu/ipc/common/memory_stats.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/message_router.h"
@@ -41,10 +41,6 @@
 
 namespace IPC {
 class Message;
-}
-
-namespace gpu {
-struct VideoMemoryUsageStats;
 }
 
 namespace content {
@@ -105,7 +101,7 @@
       const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params);
 #endif
   void OnVideoMemoryUsageStatsReceived(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const GPUVideoMemoryUsageStats& video_memory_usage_stats);
   void OnAddSubscription(int32_t process_id, unsigned int target);
   void OnRemoveSubscription(int32_t process_id, unsigned int target);