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

chrome/browser/dom_ui/gpu_internals_ui.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/browser/dom_ui/gpu_internals_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 283 matching lines @@
   basic_info->Append(NewDescriptionValuePair("GL_RENDERER",
       gpu_info.gl_renderer()));
   basic_info->Append(NewDescriptionValuePair("GL_VERSION",
       gpu_info.gl_version_string()));
   basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS",
       gpu_info.gl_extensions()));
 
   DictionaryValue* info = new DictionaryValue();
   info->Set("basic_info", basic_info);
 
-  if (gpu_info.level() == GPUInfo::kPartial) {
-    info->SetString("level", "partial");
+  if (gpu_info.progress() == GPUInfo::kPartial) {
+    info->SetString("progress", "partial");
   } else {
-    info->SetString("level", "complete");
+    info->SetString("progress", "complete");
   }
 #if defined(OS_WIN)
-  if (gpu_info.level() == GPUInfo::kComplete) {
+  if (gpu_info.progress() == GPUInfo::kComplete) {
     ListValue* dx_info = DxDiagNodeToList(gpu_info.dx_diagnostics());
     info->Set("diagnostics", dx_info);
   }
 #endif
 
   return info;
 }
 
 Value* GpuMessageHandler::OnRequestGpuInfo(const ListValue* list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Get GPU Info.
   GPUInfo gpu_info = GpuProcessHostUIShim::GetInstance()->gpu_info();
 
   std::string html;
-  if (gpu_info.level() != GPUInfo::kComplete) {
-    GpuProcessHostUIShim::GetInstance()->CollectGraphicsInfoAsynchronously(
-        GPUInfo::kComplete);
+  if (gpu_info.progress() != GPUInfo::kComplete) {
+    GpuProcessHostUIShim::GetInstance()->CollectGraphicsInfoAsynchronously();
   }
 
-  if (gpu_info.level() != GPUInfo::kUninitialized) {
+  if (gpu_info.progress() != GPUInfo::kUninitialized) {
     return GpuInfoToDict(gpu_info);
   } else {
     return NULL;
   }
 }
 
 }  // namespace
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // GpuInternalsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuInternalsUI::GpuInternalsUI(TabContents* contents) : DOMUI(contents) {
   AddMessageHandler((new GpuMessageHandler())->Attach(this));
 
   GpuHTMLSource* html_source = new GpuHTMLSource();
 
   // Set up the chrome://gpu/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }