Make gpu black list work again on Linux

chrome/browser/chrome_browser_main.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <set>
 #include <string>
@@ skipping 841 matching lines @@
   // device_event_log must be initialized after the message loop. Calls to
   // {DEVICE}_LOG prior to here will only be logged with VLOG. Some
   // platforms (e.g. chromeos) may have already initialized this.
   if (!device_event_log::IsInitialized())
     device_event_log::Initialize(0 /* default max entries */);
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostMainMessageLoopStart();
 }
 
-int ChromeBrowserMainParts::PreCreateThreads() {
-  TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreads");
+int ChromeBrowserMainParts::PreCreateThreadsBegin() {
+  TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreadsBegin");
   result_code_ = PreCreateThreadsImpl();
 
   if (result_code_ == content::RESULT_CODE_NORMAL_EXIT) {
 #if !defined(OS_ANDROID)
     // These members must be initialized before exiting this function normally.
     DCHECK(master_prefs_.get());
     DCHECK(browser_creator_.get());
 #endif  // !defined(OS_ANDROID)
     for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
-      chrome_extra_parts_[i]->PreCreateThreads();
+      chrome_extra_parts_[i]->PreCreateThreadsBegin();
   }
 
   return result_code_;
 }
 
 int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreadsImpl")
   run_message_loop_ = false;
 #if !defined(OS_ANDROID)
   chrome::MaybeShowInvalidUserDataDirWarningDialog();
@@ skipping 225 matching lines @@
   // metrics and initialize field trials. The field trials are needed by
   // IOThread's initialization which happens in BrowserProcess:PreCreateThreads.
   SetupMetricsAndFieldTrials();
 
   // ChromeOS needs ResourceBundle::InitSharedInstance to be called before this.
   browser_process_->PreCreateThreads();
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
+void ChromeBrowserMainParts::PreCreateThreadsEnd() {
+  // It is important to call gl_string_manager()->Initialize() before starting
+  // the gpu process. Internally it properly setup the black listed features.
+  // Which it is used to decide whether to start or not the gpu process from
+  // BrowserMainLoop::BrowserThreadsStarted.
+
+  // Retrieve cached GL strings from local state and use them for GPU
+  // blacklist decisions.
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+
+  if (!command_line->HasSwitch("do-init-after-starting-gpu-process")) {
+    if (g_browser_process->gl_string_manager())
+      g_browser_process->gl_string_manager()->Initialize();
+
+    // Create an instance of GpuModeManager to watch gpu mode pref change.
+    g_browser_process->gpu_mode_manager();
+  }
+}
+
 void ChromeBrowserMainParts::PreMainMessageLoopRun() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreMainMessageLoopRun");
   TRACK_SCOPED_REGION(
       "Startup", "ChromeBrowserMainParts::PreMainMessageLoopRun");
 
   result_code_ = PreMainMessageLoopRunImpl();
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreMainMessageLoopRun();
 }
@@ skipping 345 matching lines @@
 #if !defined(DISABLE_NACL)
   NaClBrowserDelegateImpl* delegate =
       new NaClBrowserDelegateImpl(browser_process_->profile_manager());
   nacl::NaClBrowser::SetDelegate(delegate);
 #endif  // !defined(DISABLE_NACL)
 
   // TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts.
   // (requires supporting early exit).
   PostProfileInit();
 
-  // Retrieve cached GL strings from local state and use them for GPU
-  // blacklist decisions.
-  if (g_browser_process->gl_string_manager())
-    g_browser_process->gl_string_manager()->Initialize();
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
-  // Create an instance of GpuModeManager to watch gpu mode pref change.
-  g_browser_process->gpu_mode_manager();
+  if (command_line->HasSwitch("do-init-after-starting-gpu-process")) {
+    VLOG(1) << "do init after starting gpu process";
+    if (g_browser_process->gl_string_manager())
+      g_browser_process->gl_string_manager()->Initialize();
+
+    // Create an instance of GpuModeManager to watch gpu mode pref change.
+    g_browser_process->gpu_mode_manager();
+  }
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (first_run::IsChromeFirstRun()) {
     first_run::AutoImport(profile_,
                           master_prefs_->homepage_defined,
@@ skipping 380 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }