summaryrefslogtreecommitdiffstats
path: root/net/socket/socks_client_socket_pool_unittest.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 18:22:24 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 18:22:24 +0000
commita7e38577aab81d13d9fc1dff5a8b6fe164ed2102 (patch)
tree03c3e30bd44f33a4317bbe5606f9c0e40c27ce40 /net/socket/socks_client_socket_pool_unittest.cc
parentb846acde84543772099763542d9411eacbe684f9 (diff)
downloadchromium_src-a7e38577aab81d13d9fc1dff5a8b6fe164ed2102.zip
chromium_src-a7e38577aab81d13d9fc1dff5a8b6fe164ed2102.tar.gz
chromium_src-a7e38577aab81d13d9fc1dff5a8b6fe164ed2102.tar.bz2
Do not attempt to reuse active sockets after a socket pool flush (usually a network change).
Implements this functionality by adding an |id_| field to ClientSocketPoolBaseHelper that is incremented on each Flush(). BUG=45872 Review URL: http://codereview.chromium.org/2647003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool_unittest.cc')
-rw-r--r--net/socket/socks_client_socket_pool_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index 33bc146..452fbcc 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -106,6 +106,7 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
AddressList(), net_log.net_log());
MockConnectJob* job = new MockConnectJob(socket, handle, callback);
job_list_.push_back(job);
+ handle->set_pool_id(1);
return job->Connect();
}
@@ -121,7 +122,9 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
}
virtual void ReleaseSocket(const std::string& group_name,
- ClientSocket* socket) {
+ ClientSocket* socket,
+ int id) {
+ EXPECT_EQ(1, id);
release_count_++;
delete socket;
}