This CL is a follow up to https://codereview.chromium.org/353713005.

net/socket/socket_test_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <cstring>
 #include <deque>
 #include <string>
@@ skipping 316 matching lines @@
   SSLClientSocket::NextProtoStatus next_proto_status;
   std::string next_proto;
   bool was_npn_negotiated;
   NextProto protocol_negotiated;
   bool client_cert_sent;
   SSLCertRequestInfo* cert_request_info;
   scoped_refptr<X509Certificate> cert;
   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|.
   bool is_in_session_cache;
 };
 
 // A DataProvider where the client must write a request before the reads (e.g.
 // the response) will complete.
 class DelayedSocketData : public StaticSocketDataProvider {
  public:
@@ skipping 634 matching lines @@
 
   bool reached_connect() const { return reached_connect_; }
 
   // Resumes the connection of a socket that was paused for testing.
   // |connect_callback_| should be set before invoking this method.
   void RestartPausedConnect();
 
  private:
   enum ConnectState {
     STATE_NONE,
-    STATE_TRANSPORT_CONNECT,
-    STATE_TRANSPORT_CONNECT_COMPLETE,
     STATE_SSL_CONNECT,
     STATE_SSL_CONNECT_COMPLETE,
   };
 
   void OnIOComplete(int result);
 
   // Runs the state transistion loop.
   int DoConnectLoop(int result);
 
-  int DoTransportConnect();
-  int DoTransportConnectComplete(int result);
   int DoSSLConnect();
   int DoSSLConnectComplete(int result);
 
   scoped_ptr<ClientSocketHandle> transport_;
   SSLSocketDataProvider* data_;
   bool is_npn_state_set_;
   bool new_npn_value_;
   bool is_protocol_negotiated_set_;
   NextProto protocol_negotiated_;
 
@@ skipping 314 matching lines @@
 
 extern const char kSOCKS5OkRequest[];
 extern const int kSOCKS5OkRequestLength;
 
 extern const char kSOCKS5OkResponse[];
 extern const int kSOCKS5OkResponseLength;
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_