| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 cr.define('settings_privacy_page', function() { | 5 cr.define('settings_privacy_page', function() { |
| 6 /** | 6 /** |
| 7 * @constructor | 7 * @constructor |
| 8 * @extends {TestBrowserProxy} | 8 * @extends {TestBrowserProxy} |
| 9 * @implements {settings.PrivacyPageBrowserProxy} | 9 * @implements {settings.PrivacyPageBrowserProxy} |
| 10 */ | 10 */ |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 function registerNativeCertificateManagerTests() { | 67 function registerNativeCertificateManagerTests() { |
| 68 suite('NativeCertificateManager', function() { | 68 suite('NativeCertificateManager', function() { |
| 69 /** @type {settings.TestPrivacyPageBrowserProxy} */ | 69 /** @type {settings.TestPrivacyPageBrowserProxy} */ |
| 70 var testBrowserProxy; | 70 var testBrowserProxy; |
| 71 | 71 |
| 72 /** @type {SettingsPrivacyPageElement} */ | 72 /** @type {SettingsPrivacyPageElement} */ |
| 73 var page; | 73 var page; |
| 74 | 74 |
| 75 suiteSetup(function() { | |
| 76 settings.main.rendered = Promise.resolve(); | |
| 77 }); | |
| 78 | |
| 79 setup(function() { | 75 setup(function() { |
| 80 testBrowserProxy = new TestPrivacyPageBrowserProxy(); | 76 testBrowserProxy = new TestPrivacyPageBrowserProxy(); |
| 81 settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy; | 77 settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy; |
| 82 PolymerTest.clearBody(); | 78 PolymerTest.clearBody(); |
| 83 page = document.createElement('settings-privacy-page'); | 79 page = document.createElement('settings-privacy-page'); |
| 84 document.body.appendChild(page); | 80 document.body.appendChild(page); |
| 85 }); | 81 }); |
| 86 | 82 |
| 87 teardown(function() { page.remove(); }); | 83 teardown(function() { page.remove(); }); |
| 88 | 84 |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 | 227 |
| 232 return { | 228 return { |
| 233 registerTests: function() { | 229 registerTests: function() { |
| 234 if (cr.isMac || cr.isWin) | 230 if (cr.isMac || cr.isWin) |
| 235 registerNativeCertificateManagerTests(); | 231 registerNativeCertificateManagerTests(); |
| 236 | 232 |
| 237 registerClearBrowsingDataTests(); | 233 registerClearBrowsingDataTests(); |
| 238 }, | 234 }, |
| 239 }; | 235 }; |
| 240 }); | 236 }); |
| OLD | NEW |