| Index: chrome/test/data/webui/settings/settings_ui_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/settings_ui_browsertest.js b/chrome/test/data/webui/settings/settings_ui_browsertest.js
|
| index ce10ed32df46e7ad422b7793fbc67ee619d7a7c8..849b4ac4b8855c5b55dab2b43490201fa4c13ff1 100644
|
| --- a/chrome/test/data/webui/settings/settings_ui_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/settings_ui_browsertest.js
|
| @@ -16,10 +16,10 @@
|
| __proto__: SettingsPageBrowserTest.prototype,
|
| };
|
|
|
| -// Times out on debug builders the Settings page can take several seconds to
|
| -// load in a Release build and several times that in a Debug build. See
|
| -// https://crbug.com/558434.
|
| -GEN('#if !defined(NDEBUG)');
|
| +// Times out on debug builders and may time out on memory bots because
|
| +// the Settings page can take several seconds to load in a Release build
|
| +// and several times that in a Debug build. See https://crbug.com/558434.
|
| +GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)');
|
| GEN('#define MAYBE_All DISABLED_All');
|
| GEN('#else');
|
| GEN('#define MAYBE_All All');
|
|
|