| Index: chrome/test/data/webui/settings/languages_page_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/languages_page_browsertest.js b/chrome/test/data/webui/settings/languages_page_browsertest.js
|
| index ea269e62f798e378c3761327ed661a1c380913bb..ae7dfab6a551a5c136e3f01768bb1afa2edb1b84 100644
|
| --- a/chrome/test/data/webui/settings/languages_page_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/languages_page_browsertest.js
|
| @@ -31,15 +31,14 @@ SettingsLanguagesPageBrowserTest.prototype = {
|
| },
|
| };
|
|
|
| -// Flaky on Windows. See https://crbug.com/641400.
|
| -// May time out on debug builders and 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(OS_WINDOWS) || defined(MEMORY_SANITIZER) || !defined(NDEBUG)');
|
| +// Flaky on Windows, Mac and Linux. See https://crbug.com/641400.
|
| +//
|
| +// May time out on debug builders and 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.
|
| +//
|
| +// Disabling this test in general.
|
| GEN('#define MAYBE_LanguagesPage DISABLED_LanguagesPage');
|
| -GEN('#else');
|
| -GEN('#define MAYBE_LanguagesPage LanguagesPage');
|
| -GEN('#endif');
|
|
|
| // Runs languages page tests.
|
| TEST_F('SettingsLanguagesPageBrowserTest', 'MAYBE_LanguagesPage', function() {
|
|
|