| 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 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 945 | 945 |
| 946 /** @override */ | 946 /** @override */ |
| 947 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 947 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 948 '../fake_chrome_event.js', | 948 '../fake_chrome_event.js', |
| 949 'fake_language_settings_private.js', | 949 'fake_language_settings_private.js', |
| 950 'fake_settings_private.js', | 950 'fake_settings_private.js', |
| 951 'languages_tests.js', | 951 'languages_tests.js', |
| 952 ]), | 952 ]), |
| 953 }; | 953 }; |
| 954 | 954 |
| 955 TEST_F('CrSettingsLanguagesTest', 'Languages', function() { | 955 // Flaky on Win and Linux, see http://crbug/692356. |
| 956 TEST_F('CrSettingsLanguagesTest', 'DISABLED_Languages', function() { |
| 956 mocha.run(); | 957 mocha.run(); |
| 957 }); | 958 }); |
| 958 | 959 |
| 959 /** | 960 /** |
| 960 * @constructor | 961 * @constructor |
| 961 * @extends {CrSettingsBrowserTest} | 962 * @extends {CrSettingsBrowserTest} |
| 962 */ | 963 */ |
| 963 function CrSettingsRouteTest() {} | 964 function CrSettingsRouteTest() {} |
| 964 | 965 |
| 965 CrSettingsRouteTest.prototype = { | 966 CrSettingsRouteTest.prototype = { |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1280 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 1281 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 1281 'test_browser_proxy.js', | 1282 'test_browser_proxy.js', |
| 1282 'test_extension_control_browser_proxy.js', | 1283 'test_extension_control_browser_proxy.js', |
| 1283 'extension_controlled_indicator_tests.js', | 1284 'extension_controlled_indicator_tests.js', |
| 1284 ]), | 1285 ]), |
| 1285 }; | 1286 }; |
| 1286 | 1287 |
| 1287 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { | 1288 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { |
| 1288 mocha.run(); | 1289 mocha.run(); |
| 1289 }); | 1290 }); |
| OLD | NEW |