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

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 454513002: This CL is a follow up to https://codereview.chromium.org/353713005. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
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 55b94bf2c6bf25ce83fde485f05efbe605a9525d..14b066239cc9c3b4cfed212a6125339b214654cc 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -331,13 +331,13 @@ TEST_P(SSLClientSocketPoolTest, SocketsConnectWithoutFlag) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.is_in_session_cache = false;
- ssl.should_block_on_connect = true;
+ ssl.should_pause_on_connect = true;
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.is_in_session_cache = false;
- ssl2.should_block_on_connect = true;
+ ssl2.should_pause_on_connect = true;
SSLSocketDataProvider ssl3(ASYNC, OK);
ssl3.is_in_session_cache = false;
- ssl3.should_block_on_connect = true;
+ ssl3.should_pause_on_connect = true;
socket_factory_.AddSSLSocketDataProvider(&ssl);
socket_factory_.AddSSLSocketDataProvider(&ssl2);
socket_factory_.AddSSLSocketDataProvider(&ssl3);
@@ -404,7 +404,7 @@ TEST_P(SSLClientSocketPoolTest, DeletedSSLConnectJob) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.is_in_session_cache = false;
- ssl.should_block_on_connect = true;
+ ssl.should_pause_on_connect = true;
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.is_in_session_cache = false;
SSLSocketDataProvider ssl3(ASYNC, OK);
@@ -469,7 +469,7 @@ TEST_P(SSLClientSocketPoolTest, DeletedSocketAfterFail) {
SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
ssl.is_in_session_cache = false;
- ssl.should_block_on_connect = true;
+ ssl.should_pause_on_connect = true;
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.is_in_session_cache = false;
SSLSocketDataProvider ssl3(ASYNC, OK);
@@ -542,10 +542,10 @@ TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsFail) {
socket_factory_.AddSocketDataProvider(&data5);
SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
ssl.is_in_session_cache = false;
- ssl.should_block_on_connect = true;
+ ssl.should_pause_on_connect = true;
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.is_in_session_cache = false;
- ssl2.should_block_on_connect = true;
+ ssl2.should_pause_on_connect = true;
SSLSocketDataProvider ssl3(ASYNC, OK);
ssl3.is_in_session_cache = false;
SSLSocketDataProvider ssl4(ASYNC, OK);
@@ -632,7 +632,7 @@ TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsSuccess) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.is_in_session_cache = false;
- ssl.should_block_on_connect = true;
+ ssl.should_pause_on_connect = true;
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.is_in_session_cache = false;
SSLSocketDataProvider ssl3(ASYNC, OK);
« net/socket/ssl_client_socket_pool.cc ('K') | « net/socket/ssl_client_socket_pool.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698