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

content/browser/gpu/gpu_data_manager.cc

Index: content/browser/gpu/gpu_data_manager.cc
===================================================================
--- content/browser/gpu/gpu_data_manager.cc	(revision 131377)
+++ content/browser/gpu/gpu_data_manager.cc	(working copy)
@@ -397,6 +397,10 @@
   return status;
 }
 
+GpuPerformanceStats GpuDataManager::GetPerformanceStats() const {
+  return GpuPerformanceStats::RetrieveGpuPerformanceStats();
+}
+
 std::string GpuDataManager::GetBlacklistVersion() const {
   GpuBlacklist* blacklist = GetGpuBlacklist();
   if (blacklist != NULL) {
@@ -561,18 +565,6 @@
   info->Set("basic_info", basic_info);
 
 #if defined(OS_WIN)
-  ListValue* perf_info = new ListValue();
-  perf_info->Append(NewDescriptionValuePair(
-      "Graphics",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.graphics)));
-  perf_info->Append(NewDescriptionValuePair(
-      "Gaming",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.gaming)));
-  perf_info->Append(NewDescriptionValuePair(
-      "Overall",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.overall)));
-  info->Set("performance_info", perf_info);
-
   Value* dx_info;
   if (gpu_info().dx_diagnostics.children.size())
     dx_info = DxDiagNodeToList(gpu_info().dx_diagnostics);