| 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 a94167c795449508ca49a45f3a59eec1ad6b3d1f..1f370be29c57609e9b09e1cb8a36cdce49f8e201 100644
|
| --- a/net/socket/transport_client_socket_pool_test_util.cc
|
| +++ b/net/socket/transport_client_socket_pool_test_util.cc
|
| @@ -34,7 +34,8 @@ 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)) {}
|
| + net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
|
| + use_tcp_fastopen_(false) {}
|
|
|
| // StreamSocket implementation.
|
| virtual int Connect(const CompletionCallback& callback) OVERRIDE {
|
| @@ -63,7 +64,8 @@ class MockConnectClientSocket : public StreamSocket {
|
| virtual void SetSubresourceSpeculation() OVERRIDE {}
|
| virtual void SetOmniboxSpeculation() OVERRIDE {}
|
| virtual bool WasEverUsed() const OVERRIDE { return false; }
|
| - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
|
| + virtual void EnableTCPFastOpen() OVERRIDE { use_tcp_fastopen_ = true; }
|
| + virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; }
|
| virtual bool WasNpnNegotiated() const OVERRIDE { return false; }
|
| virtual NextProto GetNegotiatedProtocol() const OVERRIDE {
|
| return kProtoUnknown;
|
| @@ -88,6 +90,7 @@ class MockConnectClientSocket : public StreamSocket {
|
| bool connected_;
|
| const AddressList addrlist_;
|
| BoundNetLog net_log_;
|
| + bool use_tcp_fastopen_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockConnectClientSocket);
|
| };
|
| @@ -96,7 +99,8 @@ class MockFailingClientSocket : public StreamSocket {
|
| public:
|
| MockFailingClientSocket(const AddressList& addrlist, net::NetLog* net_log)
|
| : addrlist_(addrlist),
|
| - net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {}
|
| + net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
|
| + use_tcp_fastopen_(false) {}
|
|
|
| // StreamSocket implementation.
|
| virtual int Connect(const CompletionCallback& callback) OVERRIDE {
|
| @@ -118,7 +122,8 @@ class MockFailingClientSocket : public StreamSocket {
|
| virtual void SetSubresourceSpeculation() OVERRIDE {}
|
| virtual void SetOmniboxSpeculation() OVERRIDE {}
|
| virtual bool WasEverUsed() const OVERRIDE { return false; }
|
| - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
|
| + virtual void EnableTCPFastOpen() OVERRIDE { use_tcp_fastopen_ = true; }
|
| + virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; }
|
| virtual bool WasNpnNegotiated() const OVERRIDE { return false; }
|
| virtual NextProto GetNegotiatedProtocol() const OVERRIDE {
|
| return kProtoUnknown;
|
| @@ -143,6 +148,7 @@ class MockFailingClientSocket : public StreamSocket {
|
| private:
|
| const AddressList addrlist_;
|
| BoundNetLog net_log_;
|
| + bool use_tcp_fastopen_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockFailingClientSocket);
|
| };
|
| @@ -158,6 +164,7 @@ 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
|
| @@ -228,7 +235,8 @@ class MockTriggerableClientSocket : public StreamSocket {
|
| virtual void SetSubresourceSpeculation() OVERRIDE {}
|
| virtual void SetOmniboxSpeculation() OVERRIDE {}
|
| virtual bool WasEverUsed() const OVERRIDE { return false; }
|
| - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
|
| + virtual void EnableTCPFastOpen() OVERRIDE { use_tcp_fastopen_ = true; }
|
| + virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; }
|
| virtual bool WasNpnNegotiated() const OVERRIDE { return false; }
|
| virtual NextProto GetNegotiatedProtocol() const OVERRIDE {
|
| return kProtoUnknown;
|
| @@ -261,6 +269,7 @@ class MockTriggerableClientSocket : public StreamSocket {
|
| const AddressList addrlist_;
|
| BoundNetLog net_log_;
|
| CompletionCallback callback_;
|
| + bool use_tcp_fastopen_;
|
|
|
| base::WeakPtrFactory<MockTriggerableClientSocket> weak_factory_;
|
|
|
|
|