Collect GPU info before enabling sandbox.

content/gpu/gpu_child_thread.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "content/gpu/gpu_child_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
 const int kGpuTimeout = 10000;
 
 namespace {
 
 bool GpuProcessLogMessageHandler(int severity,
                                  const char* file, int line,
                                  size_t message_start,
                                  const std::string& str) {
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
   ChildThread::current()->Send(
       new GpuHostMsg_OnLogMessage(severity, header, message));
   return false;
 }
 
 }  // namespace
 
-GpuChildThread::GpuChildThread(bool dead_on_arrival)
-    : dead_on_arrival_(dead_on_arrival) {
+GpuChildThread::GpuChildThread(bool dead_on_arrival,
+                               const content::GPUInfo& gpu_info)
+    : dead_on_arrival_(dead_on_arrival),
+      gpu_info_(gpu_info) {
 #if defined(OS_WIN)
   target_services_ = NULL;
   collecting_dx_diagnostics_ = false;
 #endif
 }
 
 GpuChildThread::GpuChildThread(const std::string& channel_id)
     : ChildThread(channel_id),
       dead_on_arrival_(false) {
 #if defined(OS_WIN)
   target_services_ = NULL;
   collecting_dx_diagnostics_ = false;
 #endif
+  if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info_)) {
+    LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo failed";
+  }
 }
 
 
 GpuChildThread::~GpuChildThread() {
   logging::SetLogMessageHandler(NULL);
 }
 
 void GpuChildThread::Init(const base::Time& process_start_time) {
   process_start_time_ = process_start_time;
 }
@@ skipping 31 matching lines @@
     MessageLoop::current()->Quit();
     return;
   }
 
   // We don't need to pipe log messages if we are running the GPU thread in
   // the browser process.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU))
     logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
-  // Always set gpu info and send it back, even if there's an error and it's
-  // impartially collected.
-  bool succeeded = gpu_info_collector::CollectGraphicsInfo(&gpu_info_);
-  content::GetContentClient()->SetGpuInfo(gpu_info_);
-  LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo complete. success = " <<
-               succeeded;
-
   // Record initialization only after collecting the GPU info because that can
   // take a significant amount of time.
   gpu_info_.initialization_time = base::Time::Now() - process_start_time_;
 
   // In addition to disabling the watchdog if the command line switch is
   // present, disable it in two other cases. OSMesa is expected to run very
   // slowly.  Also disable the watchdog on valgrind because the code is expected
   // to run slowly in that case.
   bool enable_watchdog =
       !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 106 matching lines @@
 // Runs on the main thread.
 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread,
                                       const content::DxDiagNode& node) {
   thread->gpu_info_.dx_diagnostics = node;
   thread->gpu_info_.finalized = true;
   thread->collecting_dx_diagnostics_ = false;
   thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
 }
 
 #endif