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

2 files changed, 15 insertions, 11 deletions

diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 8191bbe..2444756 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -13,8 +13,8 @@
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "net/base/address_family.h"
+#include "net/base/address_list.h"
 #include "net/base/auth.h"
-#include "net/base/host_resolver_proc.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_info.h"
 #include "net/http/http_network_session.h"
@@ -656,16 +656,19 @@ bool MockClientSocket::IsConnectedAndIdle() const {
 }
 
 int MockClientSocket::GetPeerAddress(AddressList* address) const {
-  return net::SystemHostResolverProc("192.0.2.33", ADDRESS_FAMILY_UNSPECIFIED,
-                                     0, address, NULL);
+  IPAddressNumber ip;
+  bool rv = ParseIPLiteralToNumber("192.0.2.33", &ip);
+  CHECK(rv);
+  *address = AddressList::CreateFromIPAddress(ip, 0);
+  return OK;
 }
 
 int MockClientSocket::GetLocalAddress(IPEndPoint* address) const {
   IPAddressNumber ip;
-  if (!ParseIPLiteralToNumber("192.0.2.33", &ip))
-    return ERR_FAILED;
+  bool rv = ParseIPLiteralToNumber("192.0.2.33", &ip);
+  CHECK(rv);
   *address = IPEndPoint(ip, 123);
-      return OK;
+  return OK;
 }
 
 const BoundNetLog& MockClientSocket::NetLog() const {
@@ -677,7 +680,7 @@ void MockClientSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
 }
 
 void MockClientSocket::GetSSLCertRequestInfo(
-    net::SSLCertRequestInfo* cert_request_info) {
+  net::SSLCertRequestInfo* cert_request_info) {
 }
 
 int MockClientSocket::ExportKeyingMaterial(const base::StringPiece& label,
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) };