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

chrome/test/gpu/gpu_pixel_browsertest.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 <string>
 #include <vector>
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/callback.h"
@@ skipping 98 matching lines @@
 
 // Collects info about the GPU. Iff the info is collected, |client_info| will be
 // set and true will be returned. This info may be partial or complete. This
 // will return false if we are running in a virtualized environment.
 bool CollectGPUInfo(GPUInfo* client_info) {
   CHECK(client_info);
   GpuProcessHostUIShim* gpu_host_shim = GpuProcessHostUIShim::GetInstance();
   if (!gpu_host_shim)
     return false;
   GPUInfo info = gpu_host_shim->gpu_info();
-  if (info.level() == GPUInfo::kUninitialized) {
+  if (info.progress() == GPUInfo::kUninitialized) {
     GPUInfoCollectedObserver observer(gpu_host_shim);
-    gpu_host_shim->CollectGraphicsInfoAsynchronously(GPUInfo::kPartial);
+    gpu_host_shim->CollectGraphicsInfoAsynchronously();
     ui_test_utils::RunMessageLoop();
     if (!observer.gpu_info_collected())
       return false;
     info = gpu_host_shim->gpu_info();
   }
   *client_info = info;
   return true;
 }
 
 }  // namespace
@@ skipping 181 matching lines @@
   ASSERT_TRUE(message_queue.WaitForMessage(NULL));
 
   SkBitmap bitmap;
   gfx::Size container_size(500, 500);
   ResizeTabContainer(browser(), container_size);
   ASSERT_TRUE(ui_test_utils::TakeRenderWidgetSnapshot(
       browser()->GetSelectedTabContents()->render_view_host(),
       container_size, &bitmap));
   ASSERT_TRUE(CompareImages(bitmap, ""));
 }