| 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 | 261 |
| 262 CertificateManagerSettingsWebUITest.prototype = { | 262 CertificateManagerSettingsWebUITest.prototype = { |
| 263 __proto__: CertificateManagerWebUITest.prototype, | 263 __proto__: CertificateManagerWebUITest.prototype, |
| 264 | 264 |
| 265 /** | 265 /** |
| 266 * Browse to the certificate manager dialog in the Settings page. | 266 * Browse to the certificate manager dialog in the Settings page. |
| 267 */ | 267 */ |
| 268 browsePreload: CERTIFICATE_MANAGER_SETTINGS_PAGE_URL, | 268 browsePreload: CERTIFICATE_MANAGER_SETTINGS_PAGE_URL, |
| 269 }; | 269 }; |
| 270 | 270 |
| 271 | |
| 272 // TODO(crbug.com/657514) Flakes on linux and chromeos. | |
| 273 GEN('#if defined(OS_LINUX) || defined(OS_CHROMEOS)'); | |
| 274 GEN('#define MAYBE_testViewAndDeleteCert ' + | |
| 275 'DISABLED_testViewAndDeleteCert'); | |
| 276 GEN('#else'); | |
| 277 GEN('#define MAYBE_testViewAndDeleteCert testViewAndDeleteCert'); | |
| 278 GEN('#endif'); | |
| 279 TEST_F('CertificateManagerSettingsWebUITest', | 271 TEST_F('CertificateManagerSettingsWebUITest', |
| 280 'MAYBE_testViewAndDeleteCert', function() { | 272 'testViewAndDeleteCert', function() { |
| 281 assertEquals(this.browsePreload, document.location.href); | 273 assertEquals(this.browsePreload, document.location.href); |
| 282 | 274 |
| 283 this.mockHandler.expects(once()).viewCertificate(['c1']); | 275 this.mockHandler.expects(once()).viewCertificate(['c1']); |
| 284 | 276 |
| 285 expectTrue($('personalCertsTab-view').disabled); | 277 expectTrue($('personalCertsTab-view').disabled); |
| 286 expectTrue($('personalCertsTab-backup').disabled); | 278 expectTrue($('personalCertsTab-backup').disabled); |
| 287 expectTrue($('personalCertsTab-delete').disabled); | 279 expectTrue($('personalCertsTab-delete').disabled); |
| 288 expectFalse($('personalCertsTab-import').disabled); | 280 expectFalse($('personalCertsTab-import').disabled); |
| 289 if (this.isChromeOS) | 281 if (this.isChromeOS) |
| 290 expectFalse($('personalCertsTab-import-and-bind').disabled); | 282 expectFalse($('personalCertsTab-import-and-bind').disabled); |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 caCertsTab.querySelector('div.tree-item').click(); | 396 caCertsTab.querySelector('div.tree-item').click(); |
| 405 var certs = caCertsTab.querySelectorAll('div.tree-item div.tree-item'); | 397 var certs = caCertsTab.querySelectorAll('div.tree-item div.tree-item'); |
| 406 | 398 |
| 407 // There should be exactly three certificates displayed. | 399 // There should be exactly three certificates displayed. |
| 408 expectEquals(certs.length, 3); | 400 expectEquals(certs.length, 3); |
| 409 }); | 401 }); |
| 410 | 402 |
| 411 GEN('#endif // defined(OS_CHROMEOS)'); | 403 GEN('#endif // defined(OS_CHROMEOS)'); |
| 412 | 404 |
| 413 GEN('#endif // defined(USE_NSS_CERTS)'); | 405 GEN('#endif // defined(USE_NSS_CERTS)'); |
| OLD | NEW |