Move ATI driver version collection back to UI thread.

BUG=115212
TEST=

Review URL: http://codereview.chromium.org/9895002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129570 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 8 deletions

diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc
index ade4f33..330f299 100644
--- a/content/gpu/gpu_info_collector_linux.cc
+++ b/content/gpu/gpu_info_collector_linux.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -184,9 +184,17 @@ bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   gpu_info->finalized = true;
   bool rt = CollectGraphicsInfoGL(gpu_info);
 
+  return rt;
+}
+
+bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
+  DCHECK(gpu_info);
+
+  bool rt = CollectVideoCardInfo(gpu_info);
+
   if (gpu_info->vendor_id == 0x1002) {  // ATI
     std::string ati_driver_version = CollectDriverVersionATI();
-    if (ati_driver_version != "") {
+    if (!ati_driver_version.empty()) {
       gpu_info->driver_vendor = "ATI / AMD";
       gpu_info->driver_version = ati_driver_version;
     }
@@ -195,12 +203,6 @@ bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   return rt;
 }
 
-bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  return CollectVideoCardInfo(gpu_info);
-}
-
 bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);