chrome/test/base/test_launcher_utils.cc - Issue 23703017: Enable GPU control lists in tests on Windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/test_launcher_utils.cc

Issue 23703017: Enable GPU control lists in tests on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more back to prior code on Mac Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/test/base/test_launcher_utils.cc

diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc

index 1f81ef93dcfb7a7959d9713d58e1a451c9dd087b..d404c0c161119a6895c5161cc94b97c99a26126c 100644

--- a/chrome/test/base/test_launcher_utils.cc

+++ b/chrome/test/base/test_launcher_utils.cc

@@ -47,9 +47,11 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {

// Don't install default apps.

command_line->AppendSwitch(switches::kDisableDefaultApps);

+#if defined(OS_MACOSX)

// Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist

- // auto-update.

+ // auto-update on Mac for now (http://crbug.com/304833).

command_line->AppendSwitch(switches::kSkipGpuDataLoading);

+#endif

#if defined(USE_AURA)

// Disable window animations under Ash as the animations effect the