Adjustments in chrome_test_suite external dns lookups detection code:

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_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
@@ skipping 94 matching lines @@
   file_util::AppendToPath(&renderer_path,
                           chrome::kBrowserProcessExecutableName);
   command_line->AppendSwitchWithValue(switches::kRendererPath, renderer_path);
 
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   SandboxInitWrapper sandbox_wrapper;
   MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
   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 to depend on it in test code.

[Finnur, 2009/04/06 19:32:42]

nit: depend? Is that the right word to use here?

+  host_mapper->AddSimulatedFailure("wpad");
+  net::ScopedHostMapper scoped_host_mapper(host_mapper.get());
   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 71 matching lines @@
 
   // Remove all registered notifications, otherwise by the time the
   // destructor is run the NotificationService is dead.
   registrar_.RemoveAll();
 
   // Stop the HTTP server.
   http_server_ = NULL;
 
   MessageLoopForUI::current()->Quit();
 }