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

chrome/browser/task_manager/task_manager.h

 // Copyright (c) 2012 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_MANAGER_TASK_MANAGER_H_
 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "gpu/ipc/common/memory_stats.h"
+#include "content/public/common/gpu_memory_stats.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 
 class PrefRegistrySimple;
 class PrivateWorkingSetSnapshot;
 class TaskManagerModel;
 class TaskManagerModelGpuDataManagerObserver;
 
 namespace base {
 class ProcessMetrics;
 }
@@ skipping 256 matching lines @@
   void ModelChanged();
 
   // Updates the values for all rows.
   void Refresh();
 
   // Do a bulk repopulation of the physical_memory data on platforms where that
   // is faster.
   void RefreshPhysicalMemoryFromWorkingSetSnapshot();
 
   void NotifyVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
+      const content::GPUVideoMemoryUsageStats& video_memory_usage_stats);
 
   void NotifyBytesRead(const net::URLRequest& request, int64_t bytes_read);
 
   void RegisterOnDataReadyCallback(const base::Closure& callback);
 
   void NotifyDataReady();
 
  private:
   friend class base::RefCountedThreadSafe<TaskManagerModel>;
   friend class TaskManagerBrowserTest;
@@ skipping 190 matching lines @@
 
   // A map to retrieve the process metrics for a process. The ProcessMetrics are
   // owned by the model.
   MetricsMap metrics_map_;
 
   // A map that keeps track of the number of bytes read per process since last
   // tick. The Resources are owned by the ResourceProviders.
   ResourceValueMap current_byte_count_map_;
 
   // A map that contains the video memory usage for a process
-  gpu::VideoMemoryUsageStats video_memory_usage_stats_;
+  content::GPUVideoMemoryUsageStats video_memory_usage_stats_;
 
   // Set to true when we've requested video stats and false once we get them.
   bool pending_video_memory_usage_stats_update_;
 
   // An observer waiting for video memory usage stats updates from the GPU
   // process
   scoped_ptr<TaskManagerModelGpuDataManagerObserver>
       video_memory_usage_stats_observer_;
 
   base::ObserverList<TaskManagerModelObserver> observer_list_;
@@ skipping 26 matching lines @@
   // All per-Resource values are stored here.
   mutable PerResourceCache per_resource_cache_;
 
   // All per-Process values are stored here.
   mutable PerProcessCache per_process_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
 };
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_