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

chrome/browser/task_management/sampling/task_group.h

 // 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.
 
 #ifndef CHROME_BROWSER_TASK_MANAGEMENT_SAMPLING_TASK_GROUP_H_
 #define CHROME_BROWSER_TASK_MANAGEMENT_SAMPLING_TASK_GROUP_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process_handle.h"
 #include "base/process/process_metrics.h"
 #include "build/build_config.h"
 #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"
-
-namespace gpu {
-struct VideoMemoryUsageStats;
-}
+#include "content/public/common/gpu_memory_stats.h"
 
 namespace task_management {
 
 // Defines a group of tasks tracked by the task manager which belong to the same
 // process. This class lives on the UI thread.
 class TaskGroup {
  public:
   TaskGroup(
       base::ProcessHandle proc_handle,
       base::ProcessId proc_id,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_pool_runner);
   ~TaskGroup();
 
   // Adds and removes the given |task| to this group. |task| must be running on
   // the same process represented by this group.
   void AddTask(Task* task);
   void RemoveTask(Task* task);
 
-  void Refresh(const gpu::VideoMemoryUsageStats& gpu_memory_stats,
+  void Refresh(const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
                base::TimeDelta update_interval,
                int64_t refresh_flags);
 
   // Appends the sorted IDs of the tasks that belong to this group to
   // |out_list|.
   void AppendSortedTaskIds(TaskIdList* out_list) const;
 
   Task* GetTaskById(TaskId task_id) const;
 
   const base::ProcessHandle& process_handle() const { return process_handle_; }
@@ skipping 24 matching lines @@
   int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
 #endif  // !defined(DISABLE_NACL)
 
 #if defined(OS_LINUX)
   int open_fd_count() const { return open_fd_count_; }
 #endif  // defined(OS_LINUX)
 
   int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
 
  private:
-  void RefreshGpuMemory(const gpu::VideoMemoryUsageStats& gpu_memory_stats);
+  void RefreshGpuMemory(
+      const content::GPUVideoMemoryUsageStats& gpu_memory_stats);
 
   void RefreshWindowsHandles();
 
   // |child_process_unique_id| see Task::GetChildProcessUniqueID().
   void RefreshNaClDebugStubPort(int child_process_unique_id);
 
   void OnCpuRefreshDone(double cpu_usage);
 
   void OnMemoryUsageRefreshDone(MemoryUsageStats memory_usage);
 
@@ skipping 44 matching lines @@
   // destroyed.
   base::WeakPtrFactory<TaskGroup> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskGroup);
 };
 
 }  // namespace task_management
 
 
 #endif  // CHROME_BROWSER_TASK_MANAGEMENT_SAMPLING_TASK_GROUP_H_