Index: net/socket/transport_client_socket_pool_test_util.cc |
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc |
index 9e738a150e15454b8eaaae9a5ea6a747b97d525a..190b1c575795c4dd55f4e2044b1ef3fff7d6bdab 100644 |
--- a/net/socket/transport_client_socket_pool_test_util.cc |
+++ b/net/socket/transport_client_socket_pool_test_util.cc |
@@ -40,8 +40,7 @@ class MockConnectClientSocket : public StreamSocket { |
MockConnectClientSocket(const AddressList& addrlist, net::NetLog* net_log) |
: connected_(false), |
addrlist_(addrlist), |
- net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)), |
- use_tcp_fastopen_(false) {} |
+ net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {} |
// StreamSocket implementation. |
int Connect(const CompletionCallback& callback) override { |
@@ -70,8 +69,7 @@ class MockConnectClientSocket : public StreamSocket { |
void SetSubresourceSpeculation() override {} |
void SetOmniboxSpeculation() override {} |
bool WasEverUsed() const override { return false; } |
- void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } |
- bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } |
+ void EnableTCPFastOpenIfSupported() override {} |
bool WasNpnNegotiated() const override { return false; } |
NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } |
bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } |
@@ -103,7 +101,6 @@ class MockConnectClientSocket : public StreamSocket { |
bool connected_; |
const AddressList addrlist_; |
BoundNetLog net_log_; |
- bool use_tcp_fastopen_; |
DISALLOW_COPY_AND_ASSIGN(MockConnectClientSocket); |
}; |
@@ -112,8 +109,7 @@ class MockFailingClientSocket : public StreamSocket { |
public: |
MockFailingClientSocket(const AddressList& addrlist, net::NetLog* net_log) |
: addrlist_(addrlist), |
- net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)), |
- use_tcp_fastopen_(false) {} |
+ net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {} |
// StreamSocket implementation. |
int Connect(const CompletionCallback& callback) override { |
@@ -135,8 +131,7 @@ class MockFailingClientSocket : public StreamSocket { |
void SetSubresourceSpeculation() override {} |
void SetOmniboxSpeculation() override {} |
bool WasEverUsed() const override { return false; } |
- void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } |
- bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } |
+ void EnableTCPFastOpenIfSupported() override {} |
bool WasNpnNegotiated() const override { return false; } |
NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } |
bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } |
@@ -170,7 +165,6 @@ class MockFailingClientSocket : public StreamSocket { |
private: |
const AddressList addrlist_; |
BoundNetLog net_log_; |
- bool use_tcp_fastopen_; |
DISALLOW_COPY_AND_ASSIGN(MockFailingClientSocket); |
}; |
@@ -186,7 +180,6 @@ class MockTriggerableClientSocket : public StreamSocket { |
is_connected_(false), |
addrlist_(addrlist), |
net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)), |
- use_tcp_fastopen_(false), |
weak_factory_(this) {} |
// Call this method to get a closure which will trigger the connect callback |
@@ -264,8 +257,7 @@ class MockTriggerableClientSocket : public StreamSocket { |
void SetSubresourceSpeculation() override {} |
void SetOmniboxSpeculation() override {} |
bool WasEverUsed() const override { return false; } |
- void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } |
- bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } |
+ void EnableTCPFastOpenIfSupported() override {} |
bool WasNpnNegotiated() const override { return false; } |
NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } |
bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } |
@@ -308,7 +300,6 @@ class MockTriggerableClientSocket : public StreamSocket { |
const AddressList addrlist_; |
BoundNetLog net_log_; |
CompletionCallback callback_; |
- bool use_tcp_fastopen_; |
ConnectionAttempts connection_attempts_; |
base::WeakPtrFactory<MockTriggerableClientSocket> weak_factory_; |