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, 7 insertions, 10 deletions

diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 2444756..8191bbe 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,19 +656,16 @@ bool MockClientSocket::IsConnectedAndIdle() const {
 }
 
 int MockClientSocket::GetPeerAddress(AddressList* address) const {
-  IPAddressNumber ip;
-  bool rv = ParseIPLiteralToNumber("192.0.2.33", &ip);
-  CHECK(rv);
-  *address = AddressList::CreateFromIPAddress(ip, 0);
-  return OK;
+  return net::SystemHostResolverProc("192.0.2.33", ADDRESS_FAMILY_UNSPECIFIED,
+                                     0, address, NULL);
 }
 
 int MockClientSocket::GetLocalAddress(IPEndPoint* address) const {
   IPAddressNumber ip;
-  bool rv = ParseIPLiteralToNumber("192.0.2.33", &ip);
-  CHECK(rv);
+  if (!ParseIPLiteralToNumber("192.0.2.33", &ip))
+    return ERR_FAILED;
   *address = IPEndPoint(ip, 123);
-  return OK;
+      return OK;
 }
 
 const BoundNetLog& MockClientSocket::NetLog() const {
@@ -680,7 +677,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,