Reland 72704 - Defered collect DirectX diagnostics until they are needed for ...

chrome/common/gpu_info.cc

 // Copyright (c) 2006-2010 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/common/gpu_info.h"
 
 GPUInfo::GPUInfo()
-    : progress_(kUninitialized),
+    : level_(kUninitialized),
       vendor_id_(0),
       device_id_(0),
       driver_vendor_(""),
       driver_version_(""),
       pixel_shader_version_(0),
       vertex_shader_version_(0),
       gl_version_(0),
       gl_version_string_(""),
       gl_vendor_(""),
       gl_renderer_(""),
       gl_extensions_(""),
       can_lose_context_(false) {
 }
 
-GPUInfo::Progress GPUInfo::progress() const {
-  return progress_;
+GPUInfo::Level GPUInfo::level() const {
+  return level_;
 }
 
 base::TimeDelta GPUInfo::initialization_time() const {
   return initialization_time_;
 }
 
 uint32 GPUInfo::vendor_id() const {
   return vendor_id_;
 }
 
@@ skipping 34 matching lines @@
 }
 
 std::string GPUInfo::gl_extensions() const {
   return gl_extensions_;
 }
 
 bool GPUInfo::can_lose_context() const {
   return can_lose_context_;
 }
 
-void GPUInfo::SetProgress(Progress progress) {
-  progress_ = progress;
+void GPUInfo::SetLevel(Level level) {
+  level_ = level;
 }
 
 void GPUInfo::SetInitializationTime(
     const base::TimeDelta& initialization_time) {
   initialization_time_ = initialization_time;
 }
 
 void GPUInfo::SetVideoCardInfo(uint32 vendor_id, uint32 device_id) {
   vendor_id_ = vendor_id;
   device_id_ = device_id;
@@ skipping 37 matching lines @@
 
 #if defined(OS_WIN)
 const DxDiagNode& GPUInfo::dx_diagnostics() const {
   return dx_diagnostics_;
 }
 
 void GPUInfo::SetDxDiagnostics(const DxDiagNode& dx_diagnostics) {
   dx_diagnostics_ = dx_diagnostics;
 }
 #endif