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

content/public/common/gpu_info.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 CONTENT_PUBLIC_COMMON_GPU_INFO_H_
 #define CONTENT_PUBLIC_COMMON_GPU_INFO_H_
 #pragma once
 
 // Provides access to the GPU information for the system
 // on which chrome is currently running.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/common/dx_diag_node.h"
+#include "content/public/common/gpu_performance_stats.h"
 
 namespace content {
 
 struct CONTENT_EXPORT GPUInfo {
   GPUInfo();
   ~GPUInfo();
 
   // Whether more GPUInfo fields might be collected in the future.
   bool finalized;
 
@@ skipping 39 matching lines @@
   // The GL_RENDERER string.  "" if we are not using OpenGL.
   std::string gl_renderer;
 
   // The GL_EXTENSIONS string.  "" if we are not using OpenGL.
   std::string gl_extensions;
 
   // The device semantics, i.e. whether the Vista and Windows 7 specific
   // semantics are available.
   bool can_lose_context;
 
+  // By default all values are 0.
+  GpuPerformanceStats performance_stats;
+
 #if defined(OS_WIN)
   // The information returned by the DirectX Diagnostics Tool.
   DxDiagNode dx_diagnostics;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_GPU_INFO_H_