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

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

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 638
639 // Import client cert for test. These interfaces require NSS. 639 // Import client cert for test. These interfaces require NSS.
640 net::NSSCertDatabase* cert_db = net::NSSCertDatabase::GetInstance(); 640 net::NSSCertDatabase* cert_db = net::NSSCertDatabase::GetInstance();
641 scoped_refptr<net::CryptoModule> crypt_module = cert_db->GetPublicModule(); 641 scoped_refptr<net::CryptoModule> crypt_module = cert_db->GetPublicModule();
642 std::string pkcs12_data; 642 std::string pkcs12_data;
643 FilePath cert_path; 643 FilePath cert_path;
644 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &cert_path)); 644 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &cert_path));
645 cert_path = cert_path.Append( 645 cert_path = cert_path.Append(
646 FILE_PATH_LITERAL("net/data/ssl/certificates/websocket_client_cert.p12")); 646 FILE_PATH_LITERAL("net/data/ssl/certificates/websocket_client_cert.p12"));
647 EXPECT_TRUE(file_util::ReadFileToString(cert_path, &pkcs12_data)); 647 EXPECT_TRUE(file_util::ReadFileToString(cert_path, &pkcs12_data));
648 EXPECT_EQ(net::OK, cert_db->ImportFromPKCS12(crypt_module, 648 EXPECT_EQ(net::OK, cert_db->ImportFromPKCS12(crypt_module.get(),
649 pkcs12_data, 649 pkcs12_data,
650 string16(), 650 string16(),
651 true, 651 true,
652 NULL)); 652 NULL));
653 653
654 // Start WebSocket test server with TLS and client cert authentication. 654 // Start WebSocket test server with TLS and client cert authentication.
655 net::TestServer::SSLOptions options(net::TestServer::SSLOptions::CERT_OK); 655 net::TestServer::SSLOptions options(net::TestServer::SSLOptions::CERT_OK);
656 options.request_client_certificate = true; 656 options.request_client_certificate = true;
657 FilePath ca_path; 657 FilePath ca_path;
658 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &ca_path)); 658 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &ca_path));
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 1606
1607 // Visit a page over https that contains a frame with a redirect. 1607 // Visit a page over https that contains a frame with a redirect.
1608 1608
1609 // XMLHttpRequest insecure content in synchronous mode. 1609 // XMLHttpRequest insecure content in synchronous mode.
1610 1610
1611 // XMLHttpRequest insecure content in asynchronous mode. 1611 // XMLHttpRequest insecure content in asynchronous mode.
1612 1612
1613 // XMLHttpRequest over bad ssl in synchronous mode. 1613 // XMLHttpRequest over bad ssl in synchronous mode.
1614 1614
1615 // XMLHttpRequest over OK ssl in synchronous mode. 1615 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/sync/glue/bookmark_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698