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

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 10690122: Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: FIx curvercp Created 8 years, 5 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
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 34b995101ee6886eea161c4f2c332a771606e2a6..1dd9e55c9a5ced8b2827b962c390bf5af7e92d07 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -330,7 +330,7 @@ TEST_F(SSLClientSocketPoolTest, DirectWithNPN) {
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle.socket());
- EXPECT_TRUE(ssl_socket->was_npn_negotiated());
+ EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
}
TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) {
@@ -382,7 +382,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
EXPECT_TRUE(handle.socket());
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle.socket());
- EXPECT_TRUE(ssl_socket->was_npn_negotiated());
+ EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
std::string server_protos;
ssl_socket->GetNextProto(&proto, &server_protos);
@@ -414,7 +414,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
EXPECT_TRUE(handle.socket());
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle.socket());
- EXPECT_TRUE(ssl_socket->was_npn_negotiated());
+ EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
std::string server_protos;
ssl_socket->GetNextProto(&proto, &server_protos);
@@ -714,7 +714,7 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) {
EXPECT_TRUE(handle->socket());
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle->socket());
- EXPECT_TRUE(ssl_socket->was_npn_negotiated());
+ EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
std::string server_protos;
ssl_socket->GetNextProto(&proto, &server_protos);
@@ -793,7 +793,7 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
EXPECT_TRUE(handle->socket());
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle->socket());
- EXPECT_TRUE(ssl_socket->was_npn_negotiated());
+ EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
std::string server_protos;
ssl_socket->GetNextProto(&proto, &server_protos);
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698