OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // Mac and Windows go to native certificate manager, and certificate manager | 5 // Mac and Windows go to native certificate manager, and certificate manager |
6 // isn't implemented if OpenSSL is used. | 6 // isn't implemented if OpenSSL is used. |
7 GEN('#if defined(USE_NSS_CERTS)'); | 7 GEN('#if defined(USE_NSS_CERTS)'); |
8 | 8 |
9 GEN_INCLUDE(['options_browsertest_base.js']); | 9 GEN_INCLUDE(['options_browsertest_base.js']); |
10 | 10 |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
241 'extractable': true, | 241 'extractable': true, |
242 'policy': true }, | 242 'policy': true }, |
243 { 'id': 'ca_cert2', | 243 { 'id': 'ca_cert2', |
244 'name': 'ca_cert2', | 244 'name': 'ca_cert2', |
245 'readonly': false, | 245 'readonly': false, |
246 'untrusted': false, | 246 'untrusted': false, |
247 'extractable': true, | 247 'extractable': true, |
248 'policy': false }], | 248 'policy': false }], |
249 }], | 249 }], |
250 ] | 250 ] |
251 ].forEach(CertificateManager.onPopulateTree)})); | 251 ].forEach(CertificateManager.onPopulateTree);})); |
dschuyler
2017/05/26 19:00:25
optional: space after ;
dpapad
2017/05/26 19:08:39
Similar to previous comment. clang-format will han
michaelpg
2017/05/26 23:37:34
+1, keeping them separate should make reviews and
| |
252 }, | 252 }, |
253 }; | 253 }; |
254 | 254 |
255 /** | 255 /** |
256 * TestFixture for testing certificate manager WebUI in the Settings page. | 256 * TestFixture for testing certificate manager WebUI in the Settings page. |
257 * @extends {CertificateManagerWebUITest} | 257 * @extends {CertificateManagerWebUITest} |
258 * @constructor | 258 * @constructor |
259 */ | 259 */ |
260 function CertificateManagerSettingsWebUITest() {} | 260 function CertificateManagerSettingsWebUITest() {} |
261 | 261 |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
396 caCertsTab.querySelector('div.tree-item').click(); | 396 caCertsTab.querySelector('div.tree-item').click(); |
397 var certs = caCertsTab.querySelectorAll('div.tree-item div.tree-item'); | 397 var certs = caCertsTab.querySelectorAll('div.tree-item div.tree-item'); |
398 | 398 |
399 // There should be exactly three certificates displayed. | 399 // There should be exactly three certificates displayed. |
400 expectEquals(certs.length, 3); | 400 expectEquals(certs.length, 3); |
401 }); | 401 }); |
402 | 402 |
403 GEN('#endif // defined(OS_CHROMEOS)'); | 403 GEN('#endif // defined(OS_CHROMEOS)'); |
404 | 404 |
405 GEN('#endif // defined(USE_NSS_CERTS)'); | 405 GEN('#endif // defined(USE_NSS_CERTS)'); |
OLD | NEW |