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

chrome/gpu/gpu_info_collector_win.cc

 // Copyright (c) 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/gpu/gpu_info_collector.h"
 
 #include <windows.h>
 #include <d3d9.h>
 
 #include "app/gfx/gl/gl_context_egl.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/file_path.h"
 #include "base/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 
 // ANGLE seems to require that main.h be included before any other ANGLE header.
 #include "libEGL/main.h"
 #include "libEGL/Display.h"
 
 namespace gpu_info_collector {
 
 bool CollectGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
-    gpu_info->SetProgress(GPUInfo::kComplete);
+    gpu_info->SetLevel(GPUInfo::kComplete);
     return CollectGraphicsInfoGL(gpu_info);
   }
 
   // TODO(zmo): the following code only works if running on top of ANGLE.
   // Need to handle the case when running on top of real EGL/GLES2 drivers.
 
   egl::Display* display = static_cast<egl::Display*>(
       gfx::BaseEGLContext::GetDisplay());
   if (!display)
     return false;
 
   IDirect3DDevice9* device = display->getDevice();
   if (!device)
     return false;
 
   IDirect3D9* d3d = NULL;
   if (FAILED(device->GetDirect3D(&d3d)))
     return false;
 
   if (!CollectGraphicsInfoD3D(d3d, gpu_info))
     return false;
 
   // DirectX diagnostics are collected asynchronously because it takes a
   // couple of seconds. Do not mark as complete until that is done.
-  gpu_info->SetProgress(GPUInfo::kPartial);
+  gpu_info->SetLevel(GPUInfo::kPartial);
   return true;
 }
 
 bool CollectGraphicsInfoD3D(IDirect3D9* d3d, GPUInfo* gpu_info) {
   DCHECK(d3d);
   DCHECK(gpu_info);
 
   bool succeed = true;
 
   // Get device/driver information
@@ skipping 78 matching lines @@
 
   size_t pos = gl_version_string.find_last_not_of("0123456789.");
   if (pos != std::string::npos && pos < gl_version_string.length() - 1) {
     gpu_info->SetDriverInfo("", gl_version_string.substr(pos + 1));
     return true;
   }
   return false;
 }
 
 }  // namespace gpu_info_collector