Refactorings surrounding HostResolver:...

net/base/run_all_unittests.cc

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #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:
   NetTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
   }
 
   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());
   }
 
   virtual void Shutdown() {
     // We want to destroy this here before the TestSuite continues to tear down
     // the environment.
     message_loop_.reset();
 
     TestSuite::Shutdown();
   }
 
  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) {
   return NetTestSuite(argc, argv).Run();
 }