Add a command-line switch --skip-gpu-data-loading.

chrome/browser/web_resource/gpu_blacklist_updater.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 "chrome/browser/web_resource/gpu_blacklist_updater.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu/gpu_blacklist.h"
 #include "content/browser/gpu/gpu_data_manager.h"
+#include "content/public/common/content_switches.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
 static const int kStartGpuBlacklistFetchDelay = 6000;
 
@@ skipping 46 matching lines @@
 GpuBlacklistUpdater::~GpuBlacklistUpdater() { }
 
 // static
 void GpuBlacklistUpdater::SetupOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Initialize GpuDataManager instance, which collects preliminary
   // graphics information.  This has to happen on FILE thread.
   GpuDataManager::GetInstance();
 
-  // Skip auto updates in tests.
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if ((command_line.GetSwitchValueASCII(switches::kUseGL) ==
-      gfx::kGLImplementationOSMesaName))
-    return;
-
   // Cache the chrome version string.  This has to happen on FILE thread
   // because of chrome::VersionInfo::GetChannel().
   GetChromeVersionString();
 
+  // Skip auto updates in tests.
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kSkipGpuDataLoading))
+    return;
+
   // Post GpuBlacklistUpdate task on UI thread.  This has to happen
   // after GpuDataManager is initialized, otherwise it might be
   // initialzed on UI thread.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&GpuBlacklistUpdater::SetupOnUIThread));
 }
 
 // static
 void GpuBlacklistUpdater::SetupOnUIThread() {
@@ skipping 39 matching lines @@
 
   scoped_ptr<GpuBlacklist> gpu_blacklist(
       new GpuBlacklist(GetChromeVersionString()));
   bool success = gpu_blacklist->LoadGpuBlacklist(
       gpu_blacklist_cache, GpuBlacklist::kCurrentOsOnly);
   if (success) {
     GpuDataManager::GetInstance()->UpdateGpuBlacklist(
         gpu_blacklist.release(), preliminary);
   }
 }