Update some host_resolver()->AddRules in chrome/browser.

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <deque>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ skipping 580 matching lines @@
       int expected_number_of_loads) {
     GURL url = src_server()->GetURL(MakeAbsolute(html_file));
     return PrerenderTestURLImpl(url, expected_final_status_queue,
                                 expected_number_of_loads);
   }
 
   void SetUpOnMainThread() override {
     test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread();
     prerender::PrerenderManager::SetMode(
         prerender::PrerenderManager::PRERENDER_MODE_ENABLED);
+    const testing::TestInfo* const test_info =
+        testing::UnitTest::GetInstance()->current_test_info();
+    // This one test fails with the host resolver redirecting all hosts.
+    if (std::string(test_info->name()) != "PrerenderServerRedirectInIframe")
+      host_resolver()->AddRule("*", "127.0.0.1");
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     test_utils::PrerenderInProcessBrowserTest::
         SetUpInProcessBrowserTestFixture();
 
     // Although PreferHtmlOverPlugins is redundant with the Field Trial testing
     // configuration, the official builders don't use those, so enable it here.
     feature_list_.InitAndEnableFeature(features::kPreferHtmlOverPlugins);
   }
@@ skipping 220 matching lines @@
     if (!prerender_dict)
       return std::numeric_limits<size_t>::max();
     base::ListValue* history_list;
     if (!prerender_dict->GetList("history", &history_list))
       return std::numeric_limits<size_t>::max();
     return history_list->GetSize();
   }
 
   void SetLoaderHostOverride(const std::string& host) {
     loader_host_override_ = host;
-    host_resolver()->AddRule(host, "127.0.0.1");
   }
 
   void set_loader_path(const std::string& path) {
     loader_path_ = path;
   }
 
   void set_loader_query(const std::string& query) {
     loader_query_ = query;
   }
 
   GURL GetCrossDomainTestUrl(const std::string& path) {
     static const std::string secondary_domain = "www.foo.com";
-    host_resolver()->AddRule(secondary_domain, "127.0.0.1");
     std::string url_str(base::StringPrintf(
         "http://%s:%d/%s", secondary_domain.c_str(),
         embedded_test_server()->host_port_pair().port(), path.c_str()));
     return GURL(url_str);
   }
 
   const GURL& dest_url() const {
     return dest_url_;
   }
 
@@ skipping 3053 matching lines @@
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
                                                    "DidDisplayReallyPass()",
                                                    &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 #endif  // !defined(DISABLE_NACL)
 
 }  // namespace prerender
 
 #endif  // !defined(OS_MACOSX) || !defined(ADDRESS_SANITIZER)