Refactorings surrounding HostResolver:...

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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 "chrome/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(OS_WIN)
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/ui_test_utils.h"
-#include "net/base/host_resolver_unittest.h"
+#include "net/base/mock_host_resolver.h"
 #include "sandbox/src/dep.h"
 
 extern int BrowserMain(const MainFunctionParams&);
 
 const wchar_t kUnitTestShowWindows[] = L"show-windows";
 
 // Default delay for the time-out at which we stop the
 // inner-message loop the first time.
 const int kInitialTimeoutInMS = 30000;
 
@@ skipping 93 matching lines @@
   // Enable warning level logging so that we can see when bad stuff happens.
   command_line->AppendSwitch(switches::kEnableLogging);
   command_line->AppendSwitchWithValue(switches::kLoggingLevel,
                                       IntToWString(1));  // warning
 
   SandboxInitWrapper sandbox_wrapper;
   MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
   params.ui_task =
       NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
 
-  scoped_refptr<net::RuleBasedHostMapper> host_mapper(
-      new net::RuleBasedHostMapper());
-  ConfigureHostMapper(host_mapper.get());
-  net::ScopedHostMapper scoped_host_mapper(host_mapper.get());
+  scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_proc(
+      new net::RuleBasedHostResolverProc(NULL));
+  ConfigureHostResolverProc(host_resolver_proc);
+  net::ScopedDefaultHostResolverProc scoped_host_resolver_proc(
+      host_resolver_proc);
   BrowserMain(params);
 }
 
 void InProcessBrowserTest::TearDown() {
   // Reinstall testing browser process.
   delete g_browser_process;
   g_browser_process = new TestingBrowserProcess();
 
   browser_shutdown::delete_resources_on_shutdown = true;
 
@@ skipping 77 matching lines @@
   BrowserList::const_iterator browser = BrowserList::begin();
   for (; browser != BrowserList::end(); ++browser)
     (*browser)->CloseAllTabs();
 
   // Stop the HTTP server.
   http_server_ = NULL;
 
   MessageLoopForUI::current()->Quit();
 }
 
-void InProcessBrowserTest::ConfigureHostMapper(
-    net::RuleBasedHostMapper* host_mapper) {
-  host_mapper->AllowDirectLookup("*.google.com");
+void InProcessBrowserTest::ConfigureHostResolverProc(
+    net::RuleBasedHostResolverProc* host_resolver_proc) {
+  host_resolver_proc->AllowDirectLookup("*.google.com");
   // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
   // We don't want the test code to use it.
-  host_mapper->AddSimulatedFailure("wpad");
+  host_resolver_proc->AddSimulatedFailure("wpad");
 }
 
 void InProcessBrowserTest::TimedOut() {
   DCHECK(MessageLoopForUI::current()->IsNested());
 
   GTEST_NONFATAL_FAILURE_("Timed-out");
 
   // Start the timeout timer to prevent hangs.
   MessageLoopForUI::current()->PostDelayedTask(FROM_HERE,
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
       kSubsequentTimeoutInMS);
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }