Revert 245010 "Inject GPUDataManager support into ash to abstrac..."

trunk/src/ash/system/monitor/tray_monitor.cc

Index: trunk/src/ash/system/monitor/tray_monitor.cc
===================================================================
--- trunk/src/ash/system/monitor/tray_monitor.cc	(revision 245015)
+++ trunk/src/ash/system/monitor/tray_monitor.cc	(working copy)
@@ -4,13 +4,12 @@
 
 #include "ash/system/monitor/tray_monitor.h"
 
-#include "ash/gpu_support.h"
-#include "ash/shell.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "base/process/memory.h"
 #include "base/process/process_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/gpu_data_manager.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
@@ -54,10 +53,10 @@
 }
 
 void TrayMonitor::OnTimer() {
-  GPUSupport::GetGpuProcessHandlesCallback callback =
+  content::GpuDataManager::GetGpuProcessHandlesCallback callback =
       base::Bind(&TrayMonitor::OnGotHandles, base::Unretained(this));
   refresh_timer_.Stop();
-  Shell::GetInstance()->gpu_support()->GetGpuProcessHandles(callback);
+  content::GpuDataManager::GetInstance()->GetGpuProcessHandles(callback);
 }
 
 void TrayMonitor::OnGotHandles(const std::list<base::ProcessHandle>& handles) {