Chromium Code Reviews| 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 6f18818c003bb14990b2e97b5dc2aabcad33c4a0..2972dfad51129e6f307ee6dadc893ada138e7283 100644 |
| --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| @@ -876,13 +876,6 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'MAYBE_All', function() { |
| mocha.run(); |
| }); |
| -// Times out on Windows Tests (dbg). See https://crbug.com/651296. |
| -GEN('#if defined(OS_WIN)'); |
| -GEN('#define MAYBE_MainPage_All DISABLED_All'); |
| -GEN('#else'); |
| -GEN('#define MAYBE_MainPage_All All'); |
| -GEN('#endif'); |
| - |
| /** |
| * Test fixture for chrome/browser/resources/settings/settings_main/. |
| * @constructor |
| @@ -898,15 +891,28 @@ CrSettingsMainPageTest.prototype = { |
| /** @override */ |
| extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'search_settings_test.js', |
|
Dan Beam
2016/10/27 01:29:06
can you make a different @constructor for this fil
dpapad
2016/10/27 17:54:52
Done. I was also able to trim the deps needed to l
|
| 'settings_main_test.js', |
| ]), |
| }; |
| +// Times out on Windows Tests (dbg). See https://crbug.com/651296. |
| +GEN('#if defined(OS_WIN)'); |
| +GEN('#define MAYBE_MainPage_All DISABLED_All'); |
| +GEN('#else'); |
| +GEN('#define MAYBE_MainPage_All All'); |
| +GEN('#endif'); |
| + |
| TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() { |
| settings_main_page.registerTests(); |
| mocha.run(); |
| }); |
| +TEST_F('CrSettingsMainPageTest', 'SearchSettings', function() { |
| + settings_main_page.registerSearchTests(); |
| + mocha.run(); |
| +}); |
| + |
| /** |
| * @constructor |
| * @extends {CrSettingsBrowserTest} |