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

chrome/browser/web_resource/gpu_blacklist_updater.cc

Index: chrome/browser/web_resource/gpu_blacklist_updater.cc
===================================================================
--- chrome/browser/web_resource/gpu_blacklist_updater.cc	(revision 107391)
+++ chrome/browser/web_resource/gpu_blacklist_updater.cc	(working copy)
@@ -18,6 +18,7 @@
 #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"
@@ -84,16 +85,15 @@
   // graphics information.  This has to happen on FILE thread.
   GpuDataManager::GetInstance();
 
+  // 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.GetSwitchValueASCII(switches::kUseGL) ==
-      gfx::kGLImplementationOSMesaName))
+  if (command_line.HasSwitch(switches::kSkipGpuDataLoading))
     return;
 
-  // Cache the chrome version string.  This has to happen on FILE thread
-  // because of chrome::VersionInfo::GetChannel().
-  GetChromeVersionString();
-
   // Post GpuBlacklistUpdate task on UI thread.  This has to happen
   // after GpuDataManager is initialized, otherwise it might be
   // initialzed on UI thread.