Revert 130299 - Revert 130298 - Revert 130258 - Make it possible to blacklist gpu's based on the Wi…

chrome/browser/ui/webui/gpu_internals_ui.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 "chrome/browser/ui/webui/gpu_internals_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 188 matching lines @@
                   base::SysInfo::OperatingSystemVersion());
   dict->SetString("angle_revision", base::UintToString(BUILD_REVISION));
 #if defined(USE_SKIA)
   dict->SetString("graphics_backend", "Skia");
 #else
   dict->SetString("graphics_backend", "Core Graphics");
 #endif
   dict->SetString("blacklist_version",
       GpuDataManager::GetInstance()->GetBlacklistVersion());
 
+  GpuPerformanceStats stats =
+      GpuDataManager::GetInstance()->GetPerformanceStats();
+  dict->Set("performance", stats.ToValue());
+
   return dict;
 }
 
 Value* GpuMessageHandler::OnRequestLogMessages(const ListValue*) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return gpu_data_manager_->log_messages().DeepCopy();
 }
 
 void GpuMessageHandler::OnGpuInfoUpdate() {
@@ skipping 21 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuInternalsUI::GpuInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new GpuMessageHandler());
 
   // Set up the chrome://gpu-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(CreateGpuHTMLSource());
 }