Adjustments in chrome_test_suite external dns lookups detection code:

- allow resolving local hostname
- simulate a failing lookup of "wpad" in in_process_browser_test

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

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

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index e3c064d..a9fa5c4 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -112,13 +112,15 @@ void InProcessBrowserTest::SetUp() {
   params.ui_task =
       NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
 
-  // TODO(sky): Don't make a real dns lookup here or simulate a failing
-  // lookup.  But if it's really needed then remove the TODO.
   scoped_refptr<net::RuleBasedHostMapper> host_mapper(
       new net::RuleBasedHostMapper());
+  // TODO(sky): Don't make a real dns lookup here or simulate a failing
+  // lookup.
   host_mapper->AllowDirectLookup("*.google.com");
-  net::ScopedHostMapper scoped_host_mapper;
-  scoped_host_mapper.Init(host_mapper.get());
+  // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
+  // We don't want the test code to use it.
+  host_mapper->AddSimulatedFailure("wpad");
+  net::ScopedHostMapper scoped_host_mapper(host_mapper.get());
   BrowserMain(params);
 }