diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:25:57 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:25:57 +0000 |
commit | 23e095ecd5b4ada88e343b6ce5c7d4f094ca71e6 (patch) | |
tree | eebf1c96a90a1fcf71d6fcd28df2a1c68f22a00f /net/socket/socket_test_util.cc | |
parent | 459773c256a5d5f7d001298481c8e503a5a1f588 (diff) | |
download | chromium_src-23e095ecd5b4ada88e343b6ce5c7d4f094ca71e6.zip chromium_src-23e095ecd5b4ada88e343b6ce5c7d4f094ca71e6.tar.gz chromium_src-23e095ecd5b4ada88e343b6ce5c7d4f094ca71e6.tar.bz2 |
Unlike a real TCPClientSocket, the MockTCPClientSocket was still calling
the pending_callback_ for IO after being disconnected. This did cause a
bug in one of the SpdySession tests, SpdyNetworkTransactionTest.WriteError,
since the SpdySession would delete itself shortly after calling Disconnect
on its socket.
Contributed by gavinp@google.com
BUG=41394
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r-- | net/socket/socket_test_util.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 7e2afc7..18790be 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -95,6 +95,11 @@ int MockTCPClientSocket::Connect(net::CompletionCallback* callback, return data_->connect_data().result; } +void MockTCPClientSocket::Disconnect() { + MockClientSocket::Disconnect(); + pending_callback_ = NULL; +} + bool MockTCPClientSocket::IsConnected() const { return connected_ && !peer_closed_connection_; } |