| Index: chrome/test/data/webui/settings/cr_settings_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
|
| index 7dcce60ed96aaa9eaf76d0fa1afa8fbd0a148e04..ffe41d4eb29ffe17dc10e9cf2260ffeb87778e85 100644
|
| --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
|
| @@ -936,7 +936,8 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'MAYBE_All', function() {
|
| });
|
|
|
| // Times out on Windows Tests (dbg). See https://crbug.com/651296.
|
| -GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS)');
|
| +// Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
|
| +GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)');
|
| GEN('#define MAYBE_MainPage_All DISABLED_All');
|
| GEN('#else');
|
| GEN('#define MAYBE_MainPage_All All');
|
|
|