| Index: chrome/test/data/webui/settings/basic_page_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/basic_page_browsertest.js b/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| index b81e5b2fd5c111ffb0eeb21c835741eb9188f61c..66533a166a9cb5250db0d45b817105b924233045 100644
|
| --- a/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| @@ -21,10 +21,10 @@ SettingsBasicPageBrowserTest.prototype = {
|
| ]),
|
| };
|
|
|
| -// 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)');
|
| +// Times out on debug builders 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(NDEBUG)');
|
| GEN('#define MAYBE_Load DISABLED_Load');
|
| GEN('#else');
|
| GEN('#define MAYBE_Load Load');
|
|
|