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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
63 }; | 63 }; |
64 | 64 |
65 function registerNativeCertificateManagerTests() { | 65 function registerNativeCertificateManagerTests() { |
66 suite('NativeCertificateManager', function() { | 66 suite('NativeCertificateManager', function() { |
67 /** @type {settings.TestPrivacyPageBrowserProxy} */ | 67 /** @type {settings.TestPrivacyPageBrowserProxy} */ |
68 var testBrowserProxy; | 68 var testBrowserProxy; |
69 | 69 |
70 /** @type {SettingsPrivacyPageElement} */ | 70 /** @type {SettingsPrivacyPageElement} */ |
71 var page; | 71 var page; |
72 | 72 |
73 suiteSetup(function() { | |
74 settings.main.rendered = Promise.resolve(); | |
michaelpg
2016/06/29 22:46:52
it's a little unfortunate that our test has to per
Dan Beam
2016/06/29 23:12:24
Agreed. I'll think about this more. We use a lot o
| |
75 }); | |
76 | |
73 setup(function() { | 77 setup(function() { |
74 testBrowserProxy = new TestPrivacyPageBrowserProxy(); | 78 testBrowserProxy = new TestPrivacyPageBrowserProxy(); |
75 settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy; | 79 settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy; |
76 PolymerTest.clearBody(); | 80 PolymerTest.clearBody(); |
77 page = document.createElement('settings-privacy-page'); | 81 page = document.createElement('settings-privacy-page'); |
78 document.body.appendChild(page); | 82 document.body.appendChild(page); |
79 }); | 83 }); |
80 | 84 |
81 teardown(function() { page.remove(); }); | 85 teardown(function() { page.remove(); }); |
82 | 86 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
180 | 184 |
181 return { | 185 return { |
182 registerTests: function() { | 186 registerTests: function() { |
183 if (cr.isMac || cr.isWin) | 187 if (cr.isMac || cr.isWin) |
184 registerNativeCertificateManagerTests(); | 188 registerNativeCertificateManagerTests(); |
185 | 189 |
186 registerClearBrowsingDataTests(); | 190 registerClearBrowsingDataTests(); |
187 }, | 191 }, |
188 }; | 192 }; |
189 }); | 193 }); |
OLD | NEW |