Refactorings surrounding HostResolver:...

net/proxy/proxy_resolver_v8_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/host_resolver.h"
+#include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Javascript bindings for ProxyResolverV8, which returns mock values.
 // Each time one of the bindings is called into, we push the input into a
 // list, for later verification.
@@ skipping 352 matching lines @@
 
   EXPECT_EQ("arg1", bindings->dns_resolves[7]);
 
   // MyIpAddress was called two times.
   EXPECT_EQ(2, bindings->my_ip_address_count);
 }
 
 TEST(ProxyResolverV8DefaultBindingsTest, DnsResolve) {
   // Get a hold of a DefaultJSBindings* (it is a hidden impl class).
   scoped_ptr<net::ProxyResolverV8::JSBindings> bindings(
-      net::ProxyResolverV8::CreateDefaultBindings(new net::HostResolver, NULL));
+      net::ProxyResolverV8::CreateDefaultBindings(
+          new net::MockHostResolver, NULL));
 
   // Considered an error.
   EXPECT_EQ("", bindings->DnsResolve(""));
 
   const struct {
     const char* input;
     const char* expected;
   } tests[] = {
     {"www.google.com", "127.0.0.1"},
     {".", ""},
@@ skipping 11 matching lines @@
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string actual = bindings->DnsResolve(tests[i].input);
 
     // ########################################################################
     // TODO(eroman)
     // ########################################################################
     // THIS TEST IS CURRENTLY FLAWED.
     //
     // Since we are running in unit-test mode, the HostResolve is using a
-    // mock HostMapper, which will always return 127.0.0.1, without going
+    // mock HostResolverProc, which will always return 127.0.0.1, without going
     // through the real codepaths.
     //
     // It is important that these tests be run with the real thing, since we
     // need to verify that HostResolver doesn't blow up when you send it
     // weird inputs. This is necessary since the data reach it is UNSANITIZED.
     // It comes directly from the PAC javascript.
     //
     // For now we just check that it maps to 127.0.0.1.
     std::string expected = tests[i].expected;
     if (expected == "")
       expected = "127.0.0.1";
     EXPECT_EQ(expected, actual);
   }
 }
 
 TEST(ProxyResolverV8DefaultBindingsTest, MyIpAddress) {
   // Get a hold of a DefaultJSBindings* (it is a hidden impl class).
   scoped_ptr<net::ProxyResolverV8::JSBindings> bindings(
-      net::ProxyResolverV8::CreateDefaultBindings(new net::HostResolver, NULL));
+      net::ProxyResolverV8::CreateDefaultBindings(
+          new net::MockHostResolver, NULL));
 
-  // Our ip address is always going to be 127.0.0.1, since we are using a
-  // mock host mapper when running in unit-test mode.
+  // Our IP address is always going to be 127.0.0.1, since we are using a
+  // mock host resolver.
   std::string my_ip_address = bindings->MyIpAddress();
 
   EXPECT_EQ("127.0.0.1", my_ip_address);
 }