Wait for the GPU info to be collected.

chrome/browser/gpu_process_host_ui_shim.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/gpu_process_host_ui_shim.h"
 
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/child_process_logging.h"
@@ skipping 86 matching lines @@
 }
 
 const GPUInfo& GpuProcessHostUIShim::gpu_info() const {
   DCHECK(CalledOnValidThread());
   return gpu_info_;
 }
 
 void GpuProcessHostUIShim::OnGraphicsInfoCollected(const GPUInfo& gpu_info) {
   gpu_info_ = gpu_info;
   child_process_logging::SetGpuInfo(gpu_info);
+
+  // Used only in testing.
+  if (gpu_info_collected_callback_.get()) {
+    gpu_info_collected_callback_->Run();
+    gpu_info_collected_callback_.reset();

[apatrick_chromium, 2010/12/13 21:16:35]

I think the caller of set_gpu_info_collected_callback should set the callback to
null if they don't want the callback invoked in the future. As nduca pointed
out, the callback might be called multiple times with increasing amounts of
information available. Specifically the dxdiag info on windows takes a couple of
seconds to come back while the basic info like device and vendor id comes back
more quickly.

[kkania, 2010/12/13 22:12:57]

Done.

+  }
 }
 
 void GpuProcessHostUIShim::OnScheduleComposite(int renderer_id,
     int render_view_id) {
   RenderViewHost* host = RenderViewHost::FromID(renderer_id,
                                                 render_view_id);
   if (!host) {
     return;
   }
   host->ScheduleComposite();
 }
 void GpuProcessHostUIShim::OnControlMessageReceived(
     const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ScheduleComposite,
                         OnScheduleComposite);
 #endif
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }