summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gpu_data_manager.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc
index 15b5d18..40501f3 100644
--- a/chrome/browser/gpu_data_manager.cc
+++ b/chrome/browser/gpu_data_manager.cc
@@ -36,7 +36,11 @@ GpuDataManager::GpuDataManager()
DCHECK(gpu_blacklist_cache_);
gpu_blacklist_updater_ = new GpuBlacklistUpdater();
- gpu_blacklist_updater_->StartAfterDelay();
+ // Don't start auto update in tests.
+ const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+ if (browser_command_line.GetSwitchValueASCII(
+ switches::kUseGL) != gfx::kGLImplementationOSMesaName)
+ gpu_blacklist_updater_->StartAfterDelay();
}
LoadGpuBlacklist();