| 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', | 435 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
| 436 | 436 |
| 437 /** @override */ | 437 /** @override */ |
| 438 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 438 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 439 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | 439 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', |
| 440 'test_browser_proxy.js', | 440 'test_browser_proxy.js', |
| 441 'privacy_page_test.js', | 441 'privacy_page_test.js', |
| 442 ]), | 442 ]), |
| 443 }; | 443 }; |
| 444 | 444 |
| 445 TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPage', function() { | 445 // TODO(crbug.com/642574) Disabled because test is flaky. |
| 446 TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPage', function() { |
| 446 settings_privacy_page.registerTests(); | 447 settings_privacy_page.registerTests(); |
| 447 mocha.run(); | 448 mocha.run(); |
| 448 }); | 449 }); |
| 449 | 450 |
| 450 /** | 451 /** |
| 451 * Test fixture for chrome/browser/resources/settings/site_settings/. | 452 * Test fixture for chrome/browser/resources/settings/site_settings/. |
| 452 * @constructor | 453 * @constructor |
| 453 * @extends {CrSettingsBrowserTest} | 454 * @extends {CrSettingsBrowserTest} |
| 454 */ | 455 */ |
| 455 function CrSettingsSiteSettingsTest() {} | 456 function CrSettingsSiteSettingsTest() {} |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 814 'test_browser_proxy.js', | 815 'test_browser_proxy.js', |
| 815 'metrics_reporting_tests.js', | 816 'metrics_reporting_tests.js', |
| 816 ]), | 817 ]), |
| 817 }; | 818 }; |
| 818 | 819 |
| 819 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { | 820 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { |
| 820 mocha.run(); | 821 mocha.run(); |
| 821 }); | 822 }); |
| 822 | 823 |
| 823 GEN('#endif'); | 824 GEN('#endif'); |
| OLD | NEW |