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 1114 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() {
+  // GpuDataManagerImpl::GetInstance()->Initialize(); is called at the end of
+  // BrowserMainLoop::PreCreateThreads() so it is wrong to call the 2 following
+  // function in this->PreCreateThreads(). Otherwise it will access the gpu
+  // data manager before initializing it.
+  // Alternatively we could ensure that content::GpuDataManager::GetInstance()

[Zhenyao Mo, 2016/01/05 18:04:44]

No, we want to be explicit where and when Initialize() happens.

Otherwise who knows what kind of bugs may sneak into this mechanism.

Please remove this last "Alternatively" comment.

It's really sad the gl_string_manager initialization got moved to the wrong
place.

To prevent this from happening again, what we probably could do is to add a
initialized_ member in GpuDataManagerImpl and DCHECK in GetInstance() that it's
already initialized.

+  // internally calls GpuDataManagerImpl::GetInstance()->Initialize().
+
+  // 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();
+
+  // 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 350 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();
-
-  // 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.
   // TODO(bshe): Figure out which first run code to use for Aura Android. See
   // crbug.com/560498
   if (first_run::IsChromeFirstRun()) {
     first_run::AutoImport(profile_,
@@ skipping 387 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);
 }