Make gpu black list work again on Linux

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 303 matching lines @@
   CHECK(PathService::Get(DIR_CAST_HOME, &home_dir));
   if (!base::CreateDirectory(home_dir))
     return 1;
 
   // Hook for internal code
   cast_browser_process_->browser_client()->PreCreateThreads();
 
   // AudioManager is created immediately after threads are created, requiring
   // AudioManagerFactory to be set beforehand.
   ::media::AudioManager::SetFactory(new media::CastAudioManagerFactory());
+
+  // Set GL strings so GPU config code can make correct feature blacklisting/
+  // whitelisting decisions.
+  // Note: SetGLStrings can be called before GpuDataManager::Initialize.
+  scoped_ptr<CastSysInfo> sys_info = CreateSysInfo();
+  content::GpuDataManager::GetInstance()->SetGLStrings(
+      sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
+      sys_info->GetGlVersion());
 #endif
 
 #if defined(USE_AURA)
   // Screen can (and should) exist even with no displays connected. Its presence
   // is assumed as an interface to access display information, e.g. from metrics
   // code.  See CastContentWindow::CreateWindowTree for update when resolution
   // is available.
   cast_browser_process_->SetCastScreen(make_scoped_ptr(new CastScreen));
   DCHECK(!gfx::Screen::GetScreen());
   gfx::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
 #endif
 
   content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       kChromeResourceScheme);
   return 0;
 }
 
 void CastBrowserMainParts::PreMainMessageLoopRun() {
-#if !defined(OS_ANDROID)
-  // Set GL strings so GPU config code can make correct feature blacklisting/
-  // whitelisting decisions.
-  // Note: SetGLStrings MUST be called after GpuDataManager::Initialize.
-  scoped_ptr<CastSysInfo> sys_info = CreateSysInfo();
-  content::GpuDataManager::GetInstance()->SetGLStrings(
-      sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
-      sys_info->GetGlVersion());
-#endif  // !defined(OS_ANDROID)
-
   scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
   metrics::RegisterPrefs(pref_registry.get());
   cast_browser_process_->SetPrefService(
       PrefServiceHelper::CreatePrefService(pref_registry.get()));
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
 #if defined(OS_ANDROID)
   ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid());
 #endif  // defined(OS_ANDROID)
 
@@ skipping 92 matching lines @@
 #if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
 
   DeregisterKillOnAlarm();
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast