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

chrome/browser/task_manager/task_manager.cc

Index: chrome/browser/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index eb52d8e8934a9040801d0efd221771da04ab17b8..3cfb99557312157f6d5c05aafd96ef39d1ba249e 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -180,13 +180,13 @@
   }
 
   static void NotifyVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+      const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
     TaskManager::GetInstance()->model()->NotifyVideoMemoryUsageStats(
         video_memory_usage_stats);
   }
 
-  void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) override {
+  void OnVideoMemoryUsageStatsUpdate(const content::GPUVideoMemoryUsageStats&
+                                         video_memory_usage_stats) override {
     if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       NotifyVideoMemoryUsageStats(video_memory_usage_stats);
     } else {
@@ -662,7 +662,7 @@
   PerProcessValues& values(
       per_process_cache_[GetResource(index)->GetProcess()]);
   if (!values.is_video_memory_valid) {
-    gpu::VideoMemoryUsageStats::ProcessMap::const_iterator i =
+    content::GPUVideoMemoryUsageStats::ProcessMap::const_iterator i =
         video_memory_usage_stats_.process_map.find(pid);
     if (i == video_memory_usage_stats_.process_map.end())
       return false;
@@ -1248,7 +1248,7 @@
 }
 
 void TaskManagerModel::NotifyVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   DCHECK(pending_video_memory_usage_stats_update_);
   video_memory_usage_stats_ = video_memory_usage_stats;
   pending_video_memory_usage_stats_update_ = false;