Move content:GPUVideo...Stats to gpu::Video...Stats. HolyJavaStyleNamingBatman!

As a part of the GPU refactor for Mus, we are trying to eliminate spots where content/common/gpu depends on
content/. One such dependency is content::GPUVideoMemoryUsageStats.

BUG=586367
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel

Review URL: https://codereview.chromium.org/1708783002

Cr-Commit-Position: refs/heads/master@{#377036}

4 files changed, 15 insertions, 12 deletions

diff --git a/chrome/browser/task_management/sampling/task_group.cc b/chrome/browser/task_management/sampling/task_group.cc
index 9911136..3787bd3 100644
--- a/chrome/browser/task_management/sampling/task_group.cc
+++ b/chrome/browser/task_management/sampling/task_group.cc
@@ -11,6 +11,7 @@
 #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 {
 
@@ -117,10 +118,9 @@ void TaskGroup::RemoveTask(Task* task) {
   tasks_.erase(task->task_id());
 }
 
-void TaskGroup::Refresh(
-    const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
-    base::TimeDelta update_interval,
-    int64_t refresh_flags) {
+void TaskGroup::Refresh(const gpu::VideoMemoryUsageStats& 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.
@@ -180,7 +180,7 @@ Task* TaskGroup::GetTaskById(TaskId task_id) const {
 }
 
 void TaskGroup::RefreshGpuMemory(
-    const content::GPUVideoMemoryUsageStats& gpu_memory_stats) {
+    const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
   auto itr = gpu_memory_stats.process_map.find(process_id_);
   if (itr == gpu_memory_stats.process_map.end()) {
     gpu_memory_ = -1;
diff --git a/chrome/browser/task_management/sampling/task_group.h b/chrome/browser/task_management/sampling/task_group.h
index 02459fd..a9276fd 100644
--- a/chrome/browser/task_management/sampling/task_group.h
+++ b/chrome/browser/task_management/sampling/task_group.h
@@ -18,7 +18,10 @@
 #include "chrome/browser/task_management/providers/task.h"
 #include "chrome/browser/task_management/sampling/task_group_sampler.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
-#include "content/public/common/gpu_memory_stats.h"
+
+namespace gpu {
+struct VideoMemoryUsageStats;
+}
 
 namespace task_management {
 
@@ -37,7 +40,7 @@ class TaskGroup {
   void AddTask(Task* task);
   void RemoveTask(Task* task);
 
-  void Refresh(const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
+  void Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
                base::TimeDelta update_interval,
                int64_t refresh_flags);
 
@@ -82,8 +85,7 @@ class TaskGroup {
   int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
 
  private:
-  void RefreshGpuMemory(
-      const content::GPUVideoMemoryUsageStats& gpu_memory_stats);
+  void RefreshGpuMemory(const gpu::VideoMemoryUsageStats& gpu_memory_stats);
 
   void RefreshWindowsHandles();
 
diff --git a/chrome/browser/task_management/sampling/task_manager_impl.cc b/chrome/browser/task_management/sampling/task_manager_impl.cc
index 7fee4a5..6ca6fe2 100644
--- a/chrome/browser/task_management/sampling/task_manager_impl.cc
+++ b/chrome/browser/task_management/sampling/task_manager_impl.cc
@@ -297,7 +297,7 @@ void TaskManagerImpl::TaskRemoved(Task* task) {
 }
 
 void TaskManagerImpl::OnVideoMemoryUsageStatsUpdate(
-    const content::GPUVideoMemoryUsageStats& gpu_memory_stats) {
+    const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   gpu_memory_stats_ = gpu_memory_stats;
diff --git a/chrome/browser/task_management/sampling/task_manager_impl.h b/chrome/browser/task_management/sampling/task_manager_impl.h
index 562b8dc..0f0eedd 100644
--- a/chrome/browser/task_management/sampling/task_manager_impl.h
+++ b/chrome/browser/task_management/sampling/task_manager_impl.h
@@ -20,6 +20,7 @@
 #include "chrome/browser/task_management/sampling/task_manager_io_thread_helper.h"
 #include "chrome/browser/task_management/task_manager_interface.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
+#include "gpu/ipc/common/memory_stats.h"
 
 namespace task_management {
 
@@ -77,7 +78,7 @@ class TaskManagerImpl :
 
   // content::GpuDataManagerObserver:
   void OnVideoMemoryUsageStatsUpdate(
-      const content::GPUVideoMemoryUsageStats& gpu_memory_stats) override;
+      const gpu::VideoMemoryUsageStats& gpu_memory_stats) override;
 
   // The notification method on the UI thread when multiple bytes are read
   // from URLRequests. This will be called by the |io_thread_helper_|
@@ -126,7 +127,7 @@ class TaskManagerImpl :
 
   // The current GPU memory usage stats that was last received from the
   // GpuDataManager.
-  content::GPUVideoMemoryUsageStats gpu_memory_stats_;
+  gpu::VideoMemoryUsageStats gpu_memory_stats_;
 
   // The specific blocking pool SequencedTaskRunner that will be used to make
   // sure TaskGroupSampler posts their refreshes serially.