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

chrome/browser/task_management/sampling/task_group.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_management/sampling/task_group.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "content/public/browser/browser_thread.h"
-#include "gpu/ipc/common/memory_stats.h"
 
 namespace task_management {
 
 namespace {
 
 inline bool IsResourceRefreshEnabled(RefreshType refresh_type,
                                      int refresh_flags) {
   return (refresh_flags & refresh_type) != 0;
 }
 
@@ skipping 86 matching lines @@
   tasks_[task->task_id()] = task;
 }
 
 void TaskGroup::RemoveTask(Task* task) {
   DCHECK(task);
   DCHECK(ContainsKey(tasks_, task->task_id()));
 
   tasks_.erase(task->task_id());
 }
 
-void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
-                        base::TimeDelta update_interval,
-                        int64_t refresh_flags) {
+void TaskGroup::Refresh(
+    const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
+    base::TimeDelta update_interval,
+    int64_t refresh_flags) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // First refresh the enabled non-expensive resources usages on the UI thread.
   // 1- Refresh all the tasks as well as the total network usage (if enabled).
   const bool network_usage_refresh_enabled =
       IsResourceRefreshEnabled(REFRESH_TYPE_NETWORK_USAGE, refresh_flags);
   per_process_network_usage_ = network_usage_refresh_enabled ? 0 : -1;
   for (auto& task_pair : tasks_) {
     Task* task = task_pair.second;
     task->Refresh(update_interval, refresh_flags);
@@ skipping 39 matching lines @@
     out_list->push_back(task_pair.first);
 }
 
 Task* TaskGroup::GetTaskById(TaskId task_id) const {
   DCHECK(ContainsKey(tasks_, task_id));
 
   return tasks_.at(task_id);
 }
 
 void TaskGroup::RefreshGpuMemory(
-    const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
+    const content::GPUVideoMemoryUsageStats& gpu_memory_stats) {
   auto itr = gpu_memory_stats.process_map.find(process_id_);
   if (itr == gpu_memory_stats.process_map.end()) {
     gpu_memory_ = -1;
     gpu_memory_has_duplicates_ = false;
     return;
   }
 
   gpu_memory_ = itr->second.video_memory;
   gpu_memory_has_duplicates_ = itr->second.has_duplicates;
 }
@@ skipping 42 matching lines @@
 }
 #endif  // defined(OS_LINUX)
 
 void TaskGroup::OnProcessPriorityDone(bool is_backgrounded) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   is_backgrounded_ = is_backgrounded;
 }
 
 }  // namespace task_management