Refactorings surrounding HostResolver:

(1) Extract HostResolver to an interface.

The existing concrete implementation is now named HostResolverImpl. This makes it possible to create mocks with more complex behavior (i.e. choose via rules if response will be sync vs async).

(2) Transform HostMapper into HostResolverProc.

Conceptually HostResolverProc maps a hostname to a socket address, whereas HostMapper mapped a hostname to another hostname (so you were still at the mercy of the system's host resolver). With HostResolverProc you can specify the exact AddressList, making it possible to run tests requiring IPv6 socketaddrs on systems (like WinXP) that don't actually support it.

(3) Add a MockHostResolver implementation of HostResolver.

This replaces the [ScopedHostMapper + RuleBasedHostMapper + HostResolver] combo. It is less clunky and a bit more expressive.

BUG=http://crbug.com/16452
R=willchan
TEST=existing

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

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

1 files changed, 6 insertions, 6 deletions

diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc
index 6c60e2d..c4c4df7 100644
--- a/net/base/run_all_unittests.cc
+++ b/net/base/run_all_unittests.cc
@@ -30,7 +30,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/test_suite.h"
-#include "net/base/host_resolver_unittest.h"
+#include "net/base/mock_host_resolver.h"
 
 class NetTestSuite : public TestSuite {
  public:
@@ -40,12 +40,12 @@ class NetTestSuite : public TestSuite {
   virtual void Initialize() {
     TestSuite::Initialize();
 
-    host_mapper_ = new net::RuleBasedHostMapper();
-    scoped_host_mapper_.Init(host_mapper_.get());
+    host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
+    scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
     // In case any attempts are made to resolve host names, force them all to
     // be mapped to localhost.  This prevents DNS queries from being sent in
     // the process of running these unit tests.
-    host_mapper_->AddRule("*", "127.0.0.1");
+    host_resolver_proc_->AddRule("*", "127.0.0.1");
 
     message_loop_.reset(new MessageLoopForIO());
   }
@@ -60,8 +60,8 @@ class NetTestSuite : public TestSuite {
 
  private:
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_refptr<net::RuleBasedHostMapper> host_mapper_;
-  net::ScopedHostMapper scoped_host_mapper_;
+  scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_proc_;
+  net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
 };
 
 int main(int argc, char** argv) {