Move preliminary gpu info collection back to UI thread.

content/browser/gpu/gpu_data_manager.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/browser/gpu/gpu_data_manager.h"
 
 #if defined(OS_MACOSX)
 #include <CoreGraphics/CGDisplayConfiguration.h>
 #endif
 
@@ skipping 187 matching lines @@
     : complete_gpu_info_already_requested_(false),
       observer_list_(new GpuDataManagerObserverList),
       software_rendering_(false) {
   Initialize();
 }
 
 void GpuDataManager::Initialize() {
   // User flags need to be collected before any further initialization.
   user_flags_.Initialize();
 
-  // Certain tests doesn't go through the browser startup path that
-  // initializes GpuDataManager on FILE thread; therefore, it is initialized
-  // on UI thread later, and we skip the preliminary gpu info collection
-  // in such situation.
-  if (!user_flags_.skip_gpu_data_loading() &&
-      BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
+  if (!user_flags_.skip_gpu_data_loading()) {
     content::GPUInfo gpu_info;
     gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info);
     UpdateGpuInfo(gpu_info);
   }
 
 #if defined(OS_MACOSX)
   CGDisplayRegisterReconfigurationCallback(DisplayReconfigCallback, this);
 #endif
 }
 
@@ skipping 571 matching lines @@
 bool GpuDataManager::supportsAccelerated2dCanvas() const {
   if (gpu_info_.can_lose_context)
     return false;
 #if defined(USE_SKIA)
   return true;
 #else
   return false;
 #endif
 }