revert until I can figure out why the tests are hanging

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

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 6699144..39114ee 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -125,7 +125,12 @@ void InProcessBrowserTest::SetUp() {
 
   scoped_refptr<net::RuleBasedHostMapper> host_mapper(
       new net::RuleBasedHostMapper());
-  ConfigureHostMapper(host_mapper.get());
+  // TODO(sky): Don't make a real dns lookup here or simulate a failing
+  // lookup.
+  host_mapper->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");
   net::ScopedHostMapper scoped_host_mapper(host_mapper.get());
   BrowserMain(params);
 }
@@ -216,11 +221,3 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
 
   MessageLoopForUI::current()->Quit();
 }
-
-void InProcessBrowserTest::ConfigureHostMapper(
-    net::RuleBasedHostMapper* host_mapper) {
-  host_mapper->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");
-}