| Index: chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js
|
| diff --git a/chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js b/chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js
|
| index de087d46c6f38ba0777cf5009dc13bbd2bc75ca6..30424ddcc52f04bb3a26549e4ff9d02d516df58b 100644
|
| --- a/chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js
|
| +++ b/chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js
|
| @@ -28,10 +28,10 @@ SettingsEasyUnlockBrowserTest.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_EasyUnlock DISABLED_EasyUnlock');
|
| GEN('#else');
|
| GEN('#define MAYBE_EasyUnlock EasyUnlock');
|
|
|