Index: chrome/test/data/webui/settings/cr_settings_browsertest.js |
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
index 81f228105c64a9a76b9acfa547428cbf95ffd6b6..79a88b3ca0e4cce75116887a5c349f82573ee64a 100644 |
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
@@ -251,7 +251,6 @@ CrSettingsPeoplePageLockScreenTest.prototype = { |
__proto__: CrSettingsBrowserTest.prototype, |
/** @override */ |
- //browsePreload: 'chrome://md-settings/settings_main/settings_main.html', |
browsePreload: 'chrome://md-settings/people_page/lock_screen.html', |
/** @override */ |
@@ -1391,11 +1390,10 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'All', function() { |
// Times out on Windows Tests (dbg). See https://crbug.com/651296. |
// Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882 |
-GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)' + |
- ' || defined(OS_MACOSX)'); |
-GEN('#define MAYBE_MainPage_All DISABLED_All'); |
+GEN('#if !defined(NDEBUG)') |
+GEN('#define MAYBE_MainPage_All DISABLED_MainPage_All'); |
GEN('#else'); |
-GEN('#define MAYBE_MainPage_All All'); |
+GEN('#define MAYBE_MainPage_All MainPage_All'); |
GEN('#endif'); |
/** |
@@ -1414,6 +1412,7 @@ CrSettingsMainPageTest.prototype = { |
/** @override */ |
extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
'test_browser_proxy.js', |
+ 'test_util.js', |
'settings_main_test.js', |
]), |
}; |