Revert 108910 - Remove HostResolverImpl from Mock*HostResolver.

MockHostResolver should not depend on the job dispatch machinery of
HostResolverImpl. This implementation aims to be more readable/reliable
while providing the same testing utility.

MockHostResolver does not use extra threads hence cannot support 
WaitingHostResolverProc. To mock slow resolution, HangingHostResolver is
provided for unit_tests:PredictorTest.

Updated host_resolver_impl_unittest to test HostResolverImpl directly
(rather than through MockHostResolver).

BUG=99889
TEST=./net_unittests ; ./unit_tests --gtest_filter='PredictorTest.*' ; ./jingle_unittests


Review URL: http://codereview.chromium.org/8267001

TBR=szym@chromium.org
Review URL: http://codereview.chromium.org/8491023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108922 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 0ed1834..ce80719 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 HangingHostResolverWithCancel : public HostResolver {
+class HangingHostResolver : public HostResolver {
  public:
-  HangingHostResolverWithCancel() : outstanding_request_(NULL) {}
+  HangingHostResolver() : outstanding_request_(NULL) {}
 
   virtual int Resolve(const RequestInfo& info,
                       AddressList* addresses,
@@ -121,7 +121,7 @@ class HangingHostResolverWithCancel : public HostResolver {
  private:
   RequestHandle outstanding_request_;
 
-  DISALLOW_COPY_AND_ASSIGN(HangingHostResolverWithCancel);
+  DISALLOW_COPY_AND_ASSIGN(HangingHostResolver);
 };
 
 // Tests a complete handshake and the disconnection.
@@ -371,8 +371,7 @@ 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<HangingHostResolverWithCancel> hanging_resolver(
-    new HangingHostResolverWithCancel());
+  scoped_ptr<HangingHostResolver> hanging_resolver(new HangingHostResolver());
 
   // Doesn't matter what the socket data is, we will never use it -- garbage.
   MockWrite data_writes[] = { MockWrite(false, "", 0) };