From 0762d45b83e0c4f93075679e3c73a91f9121fe04 Mon Sep 17 00:00:00 2001 From: "zmo@google.com" Date: Sat, 5 Mar 2011 00:28:03 +0000 Subject: An attempt to fix the flakiness in a few UI tests. BUG=none TEST=hope these flaky tests pass TBR=vangelis@chromium.org Review URL: http://codereview.chromium.org/6621023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77007 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gpu_data_manager.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome') 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(); -- cgit v1.1