diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 01:48:31 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 01:48:31 +0000 |
| commit | 9b3ef464c036a62a58a073e14b79cf9ecb790578 (patch) | |
| tree | 816e67d3cf423e3f27997a3fc259d7cf855883d3 /net/socket/tcp_client_socket_pool_unittest.cc | |
| parent | 65695a1fa1d175e85663eeb8ae0f1942c3d09703 (diff) | |
| download | chromium_src-9b3ef464c036a62a58a073e14b79cf9ecb790578.zip chromium_src-9b3ef464c036a62a58a073e14b79cf9ecb790578.tar.gz chromium_src-9b3ef464c036a62a58a073e14b79cf9ecb790578.tar.bz2 | |
Flush socket pools and SPDY session pool properly on explicit requests and network changes.
BUG=40455,40457
Review URL: http://codereview.chromium.org/1615005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_pool_unittest.cc | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/net/socket/tcp_client_socket_pool_unittest.cc b/net/socket/tcp_client_socket_pool_unittest.cc index e7c8a9f..a41fb88 100644 --- a/net/socket/tcp_client_socket_pool_unittest.cc +++ b/net/socket/tcp_client_socket_pool_unittest.cc @@ -8,7 +8,6 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "net/base/mock_host_resolver.h" -#include "net/base/mock_network_change_notifier.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/socket/client_socket.h" @@ -247,8 +246,7 @@ class TCPClientSocketPoolTest : public ClientSocketPoolTest { kMaxSocketsPerGroup, "TCPUnitTest", host_resolver_, - &client_socket_factory_, - ¬ifier_)) { + &client_socket_factory_)) { } int StartRequest(const std::string& group_name, RequestPriority priority) { @@ -259,7 +257,6 @@ class TCPClientSocketPoolTest : public ClientSocketPoolTest { TCPSocketParams ignored_socket_params_; scoped_refptr<MockHostResolver> host_resolver_; MockClientSocketFactory client_socket_factory_; - MockNetworkChangeNotifier notifier_; scoped_refptr<TCPClientSocketPool> pool_; }; @@ -628,32 +625,6 @@ TEST_F(TCPClientSocketPoolTest, FailingActiveRequestWithPendingRequests) { EXPECT_EQ(ERR_CONNECTION_FAILED, requests_[i]->WaitForResult()); } -TEST_F(TCPClientSocketPoolTest, ResetIdleSocketsOnIPAddressChange) { - TestCompletionCallback callback; - ClientSocketHandle handle; - TCPSocketParams dest("www.google.com", 80, LOW, GURL(), false); - int rv = handle.Init("a", dest, LOW, &callback, pool_, NULL); - EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_FALSE(handle.is_initialized()); - EXPECT_FALSE(handle.socket()); - - EXPECT_EQ(OK, callback.WaitForResult()); - EXPECT_TRUE(handle.is_initialized()); - EXPECT_TRUE(handle.socket()); - - handle.Reset(); - - // Need to run all pending to release the socket back to the pool. - MessageLoop::current()->RunAllPending(); - - // Now we should have 1 idle socket. - EXPECT_EQ(1, pool_->IdleSocketCount()); - - // After an IP address change, we should have 0 idle sockets. - notifier_.NotifyIPAddressChange(); - EXPECT_EQ(0, pool_->IdleSocketCount()); -} - TEST_F(TCPClientSocketPoolTest, BackupSocketConnect) { // Case 1 tests the first socket stalling, and the backup connecting. MockClientSocketFactory::ClientSocketType case1_types[] = { |