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 849b4ac4b8855c5b55dab2b43490201fa4c13ff1..be2201cb87dab76d4ef0c615591ed035a5421980 100644 |
--- a/chrome/test/data/webui/settings/settings_ui_browsertest.js |
+++ b/chrome/test/data/webui/settings/settings_ui_browsertest.js |
@@ -18,14 +18,10 @@ SettingsUIBrowserTest.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)'); |
-GEN('#define MAYBE_All DISABLED_All'); |
-GEN('#else'); |
-GEN('#define MAYBE_All All'); |
-GEN('#endif'); |
- |
-TEST_F('SettingsUIBrowserTest', 'MAYBE_All', function() { |
+// and several times that in a Debug build. See https://crbug.com/558434 |
+// and http://crbug.com/711256. |
+ |
+TEST_F('SettingsUIBrowserTest', 'DISABLED_All', function() { |
suite('settings-ui', function() { |
var toolbar; |
var ui; |