Move GPU preliminary info collection back to UI thread.

content/gpu/gpu_info_collector_linux.cc

 // Copyright (c) 2011 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_info_collector.h"
 
 #include <dlfcn.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 164 matching lines @@
           switches::kGpuNoContextLost)) {
     gpu_info->can_lose_context = false;
   } else {
     // TODO(zmo): need to consider the case where we are running on top
     // of desktop GL and GL_ARB_robustness extension is available.
     gpu_info->can_lose_context =
         (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
   }
 
   gpu_info->finalized = true;
-  return CollectGraphicsInfoGL(gpu_info);
-}
-
-bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  bool rt = true;
-  if (!CollectVideoCardInfo(gpu_info))
-    rt = false;
+  bool rt = CollectGraphicsInfoGL(gpu_info);
 
   if (gpu_info->vendor_id == 0x1002) {  // ATI
     std::string ati_driver_version = CollectDriverVersionATI();
     if (ati_driver_version != "") {
       gpu_info->driver_vendor = "ATI / AMD";
       gpu_info->driver_version = ati_driver_version;
     }
   }
 
   return rt;
 }
 
+bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
+  DCHECK(gpu_info);
+
+  return CollectVideoCardInfo(gpu_info);
+}
+
 bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   if (IsPciSupported() == false) {
     VLOG(1) << "PCI bus scanning is not supported";
     return false;
   }
 
   // TODO(zmo): be more flexible about library name.
   PciInterface* interface = InitializeLibPci("libpci.so.3");
@@ skipping 98 matching lines @@
     return false;
   if (pos != std::string::npos)
     driver_version = driver_version.substr(0, pos);
 
   gpu_info->driver_vendor = pieces[1];
   gpu_info->driver_version = driver_version;
   return true;
 }
 
 }  // namespace gpu_info_collector