| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** @fileoverview Runs the Polymer Settings tests. */ | 5 /** @fileoverview Runs the Polymer Settings tests. */ |
| 6 | 6 |
| 7 /** @const {string} Path to source root. */ | 7 /** @const {string} Path to source root. */ |
| 8 var ROOT_PATH = '../../../../../'; | 8 var ROOT_PATH = '../../../../../'; |
| 9 | 9 |
| 10 // Polymer BrowserTest fixture. | 10 // Polymer BrowserTest fixture. |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 | 1083 |
| 1084 /** @override */ | 1084 /** @override */ |
| 1085 browsePreload: 'chrome://md-settings/languages_page/languages.html', | 1085 browsePreload: 'chrome://md-settings/languages_page/languages.html', |
| 1086 | 1086 |
| 1087 /** @override */ | 1087 /** @override */ |
| 1088 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 1088 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 1089 '../fake_chrome_event.js', | 1089 '../fake_chrome_event.js', |
| 1090 'test_browser_proxy.js', | 1090 'test_browser_proxy.js', |
| 1091 'fake_language_settings_private.js', | 1091 'fake_language_settings_private.js', |
| 1092 'fake_settings_private.js', | 1092 'fake_settings_private.js', |
| 1093 'fake_input_method_private.js', |
| 1093 'languages_tests.js', | 1094 'languages_tests.js', |
| 1094 ]), | 1095 ]), |
| 1095 }; | 1096 }; |
| 1096 | 1097 |
| 1097 // Flaky on Win and Linux, see http://crbug/692356. | 1098 // Flaky on Win and Linux, see http://crbug/692356. |
| 1098 TEST_F('CrSettingsLanguagesTest', 'DISABLED_Languages', function() { | 1099 TEST_F('CrSettingsLanguagesTest', 'Languages', function() { |
| 1099 mocha.run(); | 1100 mocha.run(); |
| 1100 }); | 1101 }); |
| 1101 | 1102 |
| 1102 /** | 1103 /** |
| 1103 * @constructor | 1104 * @constructor |
| 1104 * @extends {CrSettingsBrowserTest} | 1105 * @extends {CrSettingsBrowserTest} |
| 1105 */ | 1106 */ |
| 1106 function CrSettingsRouteTest() {} | 1107 function CrSettingsRouteTest() {} |
| 1107 | 1108 |
| 1108 CrSettingsRouteTest.prototype = { | 1109 CrSettingsRouteTest.prototype = { |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 1423 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 1423 'test_browser_proxy.js', | 1424 'test_browser_proxy.js', |
| 1424 'test_extension_control_browser_proxy.js', | 1425 'test_extension_control_browser_proxy.js', |
| 1425 'extension_controlled_indicator_tests.js', | 1426 'extension_controlled_indicator_tests.js', |
| 1426 ]), | 1427 ]), |
| 1427 }; | 1428 }; |
| 1428 | 1429 |
| 1429 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { | 1430 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { |
| 1430 mocha.run(); | 1431 mocha.run(); |
| 1431 }); | 1432 }); |
| OLD | NEW |