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

chrome/browser/task_management/sampling/task_manager_impl.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_MANAGER_IMPL_H_
 #define CHROME_BROWSER_TASK_MANAGEMENT_SAMPLING_TASK_MANAGER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/task_management/providers/task_provider.h"
 #include "chrome/browser/task_management/providers/task_provider_observer.h"
 #include "chrome/browser/task_management/sampling/task_group.h"
 #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 {
 
 // Defines a concrete implementation of the TaskManagerInterface.
 class TaskManagerImpl :
     public TaskManagerInterface,
     public TaskProviderObserver,
     content::GpuDataManagerObserver {
  public:
   ~TaskManagerImpl() override;
@@ skipping 37 matching lines @@
       blink::WebCache::ResourceTypeStats* stats) const override;
   const TaskIdList& GetTaskIdsList() const override;
   size_t GetNumberOfTasksOnSameProcess(TaskId task_id) const override;
 
   // task_management::TaskProviderObserver:
   void TaskAdded(Task* task) override;
   void TaskRemoved(Task* task) override;
 
   // content::GpuDataManagerObserver:
   void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& gpu_memory_stats) override;
+      const content::GPUVideoMemoryUsageStats& 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_|
   static void OnMultipleBytesReadUI(std::vector<BytesReadParam>* params);
 
  private:
   friend struct base::DefaultLazyInstanceTraits<TaskManagerImpl>;
 
   TaskManagerImpl();
 
@@ skipping 28 matching lines @@
   // notifications on IO thread. The manager itself lives on the UI thread, but
   // the IO thread helper lives entirely on the IO thread.
   scoped_ptr<IoThreadHelperManager> io_thread_helper_manager_;
 
   // The list of the task providers that are owned and observed by this task
   // manager implementation.
   ScopedVector<TaskProvider> task_providers_;
 
   // The current GPU memory usage stats that was last received from the
   // GpuDataManager.
-  gpu::VideoMemoryUsageStats gpu_memory_stats_;
+  content::GPUVideoMemoryUsageStats gpu_memory_stats_;
 
   // The specific blocking pool SequencedTaskRunner that will be used to make
   // sure TaskGroupSampler posts their refreshes serially.
   scoped_refptr<base::SequencedTaskRunner> blocking_pool_runner_;
 
   // This will be set to true while there are observers and the task manager is
   // running.
   bool is_running_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerImpl);
 };
 
 }  // namespace task_management
 
 #endif  // CHROME_BROWSER_TASK_MANAGEMENT_SAMPLING_TASK_MANAGER_IMPL_H_