Move GPU preliminary info collection back to UI thread.

Apparently doing it on FILE thread causes a race, which causes crbug 83153.

In order to move back to UI thread, we have to drop chrome channel support in GPU blacklist (it's a FILE operation); also, we have to move the collection of ATI driver version in linux to GPU process.

Note that this is the minimum change required for the move.  Further cleanup will follow once this is merged safely back to M16.

BUG=97535
TEST=unittest
Review URL: http://codereview.chromium.org/8670004

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

1 files changed, 7 insertions, 9 deletions

diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc
index c2abad8..ade4f33 100644
--- a/content/gpu/gpu_info_collector_linux.cc
+++ b/content/gpu/gpu_info_collector_linux.cc
@@ -182,15 +182,7 @@ bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   }
 
   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();
@@ -203,6 +195,12 @@ bool CollectPreliminaryGraphicsInfo(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);