Index: net/socket/socket_test_util.h |
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h |
index 8f046266404710d96f7bfb62a516a53df836d75d..00905cd6dbb60b79d1d5b5220c9b7aa1078c7afb 100644 |
--- a/net/socket/socket_test_util.h |
+++ b/net/socket/socket_test_util.h |
@@ -334,8 +334,8 @@ struct SSLSocketDataProvider { |
bool channel_id_sent; |
ChannelIDService* channel_id_service; |
int connection_status; |
- // Indicates that the socket should block in the Connect method. |
- bool should_block_on_connect; |
+ // Indicates that the socket should pause in the Connect method. |
+ bool should_pause_on_connect; |
// Whether or not the Socket should behave like there is a pre-existing |
// session to resume. Whether or not such a session is reported as |
// resumed is controlled by |connection_status|. |
@@ -990,8 +990,6 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { |
private: |
enum ConnectState { |
STATE_NONE, |
- STATE_TRANSPORT_CONNECT, |
- STATE_TRANSPORT_CONNECT_COMPLETE, |
STATE_SSL_CONNECT, |
STATE_SSL_CONNECT_COMPLETE, |
}; |
@@ -1001,8 +999,6 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { |
// Runs the state transistion loop. |
int DoConnectLoop(int result); |
- int DoTransportConnect(); |
- int DoTransportConnectComplete(int result); |
int DoSSLConnect(); |
int DoSSLConnectComplete(int result); |