Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 11415002: Revert 167867 - Re-enable SSLUITest.TestWSSClientCert (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 EXPECT_TRUE(LowerCaseEqualsASCII(result, "pass")); 624 EXPECT_TRUE(LowerCaseEqualsASCII(result, "pass"));
625 } 625 }
626 626
627 #if defined(USE_NSS) 627 #if defined(USE_NSS)
628 // SSL client certificate tests are only enabled when using NSS for private key 628 // SSL client certificate tests are only enabled when using NSS for private key
629 // storage, as only NSS can avoid modifying global machine state when testing. 629 // storage, as only NSS can avoid modifying global machine state when testing.
630 // See http://crbug.com/51132 630 // See http://crbug.com/51132
631 631
632 // Visit a HTTPS page which requires client cert authentication. The client 632 // Visit a HTTPS page which requires client cert authentication. The client
633 // cert will be selected automatically, then a test which uses WebSocket runs. 633 // cert will be selected automatically, then a test which uses WebSocket runs.
634 IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSClientCert) { 634 // Disabled: http://crbug.com/159985
635 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestWSSClientCert) {
635 // Open a temporary NSS DB for testing. 636 // Open a temporary NSS DB for testing.
636 crypto::ScopedTestNSSDB test_nssdb; 637 crypto::ScopedTestNSSDB test_nssdb;
637 ASSERT_TRUE(test_nssdb.is_open()); 638 ASSERT_TRUE(test_nssdb.is_open());
638 639
639 // Import client cert for test. These interfaces require NSS. 640 // Import client cert for test. These interfaces require NSS.
640 net::NSSCertDatabase* cert_db = net::NSSCertDatabase::GetInstance(); 641 net::NSSCertDatabase* cert_db = net::NSSCertDatabase::GetInstance();
641 scoped_refptr<net::CryptoModule> crypt_module = cert_db->GetPublicModule(); 642 scoped_refptr<net::CryptoModule> crypt_module = cert_db->GetPublicModule();
642 std::string pkcs12_data; 643 std::string pkcs12_data;
643 FilePath cert_path = net::GetTestCertsDirectory().Append( 644 FilePath cert_path = net::GetTestCertsDirectory().Append(
644 FILE_PATH_LITERAL("websocket_client_cert.p12")); 645 FILE_PATH_LITERAL("websocket_client_cert.p12"));
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 1602
1602 // Visit a page over https that contains a frame with a redirect. 1603 // Visit a page over https that contains a frame with a redirect.
1603 1604
1604 // XMLHttpRequest insecure content in synchronous mode. 1605 // XMLHttpRequest insecure content in synchronous mode.
1605 1606
1606 // XMLHttpRequest insecure content in asynchronous mode. 1607 // XMLHttpRequest insecure content in asynchronous mode.
1607 1608
1608 // XMLHttpRequest over bad ssl in synchronous mode. 1609 // XMLHttpRequest over bad ssl in synchronous mode.
1609 1610
1610 // XMLHttpRequest over OK ssl in synchronous mode. 1611 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698