| 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 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 done(); | 930 done(); |
| 931 }); | 931 }); |
| 932 window.history.back(); | 932 window.history.back(); |
| 933 }); | 933 }); |
| 934 }); | 934 }); |
| 935 mocha.run(); | 935 mocha.run(); |
| 936 }); | 936 }); |
| 937 | 937 |
| 938 // Times out on Windows Tests (dbg). See https://crbug.com/651296. | 938 // Times out on Windows Tests (dbg). See https://crbug.com/651296. |
| 939 // Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882 | 939 // Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882 |
| 940 GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)'); | 940 GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)' + |
| 941 ' || defined(OS_MACOSX)'); |
| 941 GEN('#define MAYBE_MainPage_All DISABLED_All'); | 942 GEN('#define MAYBE_MainPage_All DISABLED_All'); |
| 942 GEN('#else'); | 943 GEN('#else'); |
| 943 GEN('#define MAYBE_MainPage_All All'); | 944 GEN('#define MAYBE_MainPage_All All'); |
| 944 GEN('#endif'); | 945 GEN('#endif'); |
| 945 | 946 |
| 946 /** | 947 /** |
| 947 * Test fixture for chrome/browser/resources/settings/settings_main/. | 948 * Test fixture for chrome/browser/resources/settings/settings_main/. |
| 948 * @constructor | 949 * @constructor |
| 949 * @extends {CrSettingsBrowserTest} | 950 * @extends {CrSettingsBrowserTest} |
| 950 */ | 951 */ |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 1160 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 1160 'test_browser_proxy.js', | 1161 'test_browser_proxy.js', |
| 1161 'test_extension_control_browser_proxy.js', | 1162 'test_extension_control_browser_proxy.js', |
| 1162 'extension_controlled_indicator_tests.js', | 1163 'extension_controlled_indicator_tests.js', |
| 1163 ]), | 1164 ]), |
| 1164 }; | 1165 }; |
| 1165 | 1166 |
| 1166 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { | 1167 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { |
| 1167 mocha.run(); | 1168 mocha.run(); |
| 1168 }); | 1169 }); |
| OLD | NEW |