chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js - Issue 9940001: Fix imported server certs being distrusted in NSS 3.13.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review changes Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/cros/onc_network_parser.cc ('K') | « chrome/browser/resources/options2/options_bundle.js ('k') | chrome/browser/ui/webui/options2/certificate_manager_handler2.cc » ('j') | chrome/common/net/x509_certificate_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js

diff --git a/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js b/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js

index dba6492b608361d8cecc19c7607560411c95a42e..5a98285071c7b097358d2152090461ece5c85dda 100644

--- a/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js

+++ b/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js

@@ -18,14 +18,15 @@ CertificateManagerWebUITest.prototype = {

browsePreload: 'chrome://settings-frame/certificates',

};

-// Mac and Windows go to native certificate manager.

-GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');

+// Mac and Windows go to native certificate manager, and certificate manager

+// isn't implemented if OpenSSL is used.

+GEN('#if !defined(USE_NSS)');

GEN('#define MAYBE_testOpenCertificateManager ' +

'DISABLED_testOpenCertificateManager');

GEN('#else');

GEN('#define MAYBE_testOpenCertificateManager ' +

'testOpenCertificateManager');

-GEN('#endif // defined(OS_MACOSX) || defined(OS_WIN)');

+GEN('#endif // !defined(USE_NSS)');

// Test opening the certificate manager has correct location.

TEST_F('CertificateManagerWebUITest',

'MAYBE_testOpenCertificateManager', function() {