diff options
author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 15:33:09 +0000 |
---|---|---|
committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 15:33:09 +0000 |
commit | 98e1cd017db2ff2c610bec9a36803976f73a0fae (patch) | |
tree | e0796671aca7974b6a9afa9a8dd1755eef220f0e /net/socket/socks_client_socket_unittest.cc | |
parent | ed0c0996fd4dbf49c1a74a611daabc8177d6d90e (diff) | |
download | chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.zip chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.tar.gz chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.tar.bz2 |
Remove HostResolverImpl from Mock*HostResolver.
Original review: http://codereview.chromium.org/8267001/
TBR=rvargas
BUG=99889
TEST=Green tree: ./net_unittests ; ./unit_tests --gtest_filter='PredictorTest.*' ; ./jingle_unittests
Review URL: http://codereview.chromium.org/8491024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_unittest.cc')
-rw-r--r-- | net/socket/socks_client_socket_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index ce80719..0ed1834 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -81,9 +81,9 @@ SOCKSClientSocket* SOCKSClientSocketTest::BuildMockSocket( // Implementation of HostResolver that never completes its resolve request. // We use this in the test "DisconnectWhileHostResolveInProgress" to make // sure that the outstanding resolve request gets cancelled. -class HangingHostResolver : public HostResolver { +class HangingHostResolverWithCancel : public HostResolver { public: - HangingHostResolver() : outstanding_request_(NULL) {} + HangingHostResolverWithCancel() : outstanding_request_(NULL) {} virtual int Resolve(const RequestInfo& info, AddressList* addresses, @@ -121,7 +121,7 @@ class HangingHostResolver : public HostResolver { private: RequestHandle outstanding_request_; - DISALLOW_COPY_AND_ASSIGN(HangingHostResolver); + DISALLOW_COPY_AND_ASSIGN(HangingHostResolverWithCancel); }; // Tests a complete handshake and the disconnection. @@ -371,7 +371,8 @@ TEST_F(SOCKSClientSocketTest, FailedDNS) { // Calls Disconnect() while a host resolve is in progress. The outstanding host // resolve should be cancelled. TEST_F(SOCKSClientSocketTest, DisconnectWhileHostResolveInProgress) { - scoped_ptr<HangingHostResolver> hanging_resolver(new HangingHostResolver()); + scoped_ptr<HangingHostResolverWithCancel> hanging_resolver( + new HangingHostResolverWithCancel()); // Doesn't matter what the socket data is, we will never use it -- garbage. MockWrite data_writes[] = { MockWrite(false, "", 0) }; |