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

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

 // 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.
 
 #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"
 
 namespace {
 const int kRefreshTimeoutMs = 1000;
 }
 
 namespace ash {
 namespace internal {
@@ skipping 23 matching lines @@
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_->SetFontList(label_->font_list().DeriveFontListWithSizeDelta(-2));
   return view;
 }
 
 void TrayMonitor::DestroyTrayView() {
   label_ = NULL;
 }
 
 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) {
   base::SystemMemoryInfoKB mem_info;
   base::GetSystemMemoryInfo(&mem_info);
   std::string output;
   base::string16 free_bytes =
       ui::FormatBytes(static_cast<int64>(mem_info.free) * 1024);
   output = base::StringPrintf("free: %s",
                               base::UTF16ToUTF8(free_bytes).c_str());
@@ skipping 23 matching lines @@
                                base::UTF16ToUTF8(private_size).c_str(),
                                base::UTF16ToUTF8(shared_size).c_str());
   label_->SetText(base::UTF8ToUTF16(output));
   refresh_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kRefreshTimeoutMs),
       this, &TrayMonitor::OnTimer);
 }
 
 }  // namespace internal
 }  // namespace ash