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

chrome/browser/extensions/window_open_apitest.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 "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "build/build_config.h"
@@ skipping 26 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_ASH)
 #include "extensions/browser/app_window/app_window_registry.h"
 #endif
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
+class WindowOpenApiTest : public ExtensionApiTest {
+  void SetUpOnMainThread() override {
+    ExtensionApiTest::SetUpOnMainThread();
+    host_resolver()->AddRule("*", "127.0.0.1");
+  }
+};
+
 // The test uses the chrome.browserAction.openPopup API, which requires that the
 // window can automatically be activated.
 // See comments at BrowserActionInteractiveTest::ShouldRunPopupTest
 // Fails flakily on all platforms. https://crbug.com/477691
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpen) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, DISABLED_WindowOpen) {
   extensions::ResultCatcher catcher;
   ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_
       .AppendASCII("window_open").AppendASCII("spanning")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 bool WaitForTabsAndPopups(Browser* browser,
                           int num_tabs,
                           int num_popups) {
   SCOPED_TRACE(
@@ skipping 24 matching lines @@
     EXPECT_TRUE(b->is_type_popup());
     ++num_popups_seen;
   }
   EXPECT_EQ(num_popups, num_popups_seen);
 
   return ((num_browsers == chrome::GetBrowserCount(browser->profile())) &&
           (num_tabs == browser->tab_strip_model()->count()) &&
           (num_popups == num_popups_seen));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserIsApp) {
-  host_resolver()->AddRule("a.com", "127.0.0.1");
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, BrowserIsApp) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("browser_is_app")));
 
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 0, 2));
 
   for (auto* b : *BrowserList::GetInstance()) {
     if (b == browser())
       ASSERT_FALSE(b->is_app());
     else
       ASSERT_TRUE(b->is_app());
   }
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupDefault) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowOpenPopupDefault) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup")));
 
   const int num_tabs = 1;
   const int num_popups = 0;
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), num_tabs, num_popups));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupIframe) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowOpenPopupIframe) {
   base::FilePath test_data_dir;
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
   embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_iframe")));
 
   const int num_tabs = 1;
   const int num_popups = 0;
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), num_tabs, num_popups));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupLarge) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowOpenPopupLarge) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_large")));
 
   // On other systems this should open a new popup window.
   const int num_tabs = 0;
   const int num_popups = 1;
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), num_tabs, num_popups));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupSmall) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowOpenPopupSmall) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_small")));
 
   // On ChromeOS this should open a new panel (acts like a new popup window).
   // On other systems this should open a new popup window.
   const int num_tabs = 0;
   const int num_popups = 1;
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), num_tabs, num_popups));
 }
 
 // Disabled on Windows. Often times out or fails: crbug.com/177530
 #if defined(OS_WIN)
 #define MAYBE_PopupBlockingExtension DISABLED_PopupBlockingExtension
 #else
 #define MAYBE_PopupBlockingExtension PopupBlockingExtension
 #endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_PopupBlockingExtension) {
-  host_resolver()->AddRule("*", "127.0.0.1");
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, MAYBE_PopupBlockingExtension) {
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_blocking")
       .AppendASCII("extension")));
 
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 5, 3));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingHostedApp) {
-  host_resolver()->AddRule("*", "127.0.0.1");
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, PopupBlockingHostedApp) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_blocking")
       .AppendASCII("hosted_app")));
 
   // The app being tested owns the domain a.com .  The test URLs we navigate
   // to below must be within that domain, so that they fall within the app's
   // web extent.
   GURL::Replacements replace_host;
@@ skipping 12 matching lines @@
   browser()->OpenURL(OpenURLParams(open_tab, Referrer(),
                                    WindowOpenDisposition::NEW_FOREGROUND_TAB,
                                    ui::PAGE_TRANSITION_TYPED, false));
   browser()->OpenURL(OpenURLParams(open_popup, Referrer(),
                                    WindowOpenDisposition::NEW_FOREGROUND_TAB,
                                    ui::PAGE_TRANSITION_TYPED, false));
 
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowArgumentsOverflow) {
   ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpener) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, DISABLED_WindowOpener) {
   ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_;
 }
 
 #if defined(OS_MACOSX)
 // Extension popup windows are incorrectly sized on OSX, crbug.com/225601
 #define MAYBE_WindowOpenSized DISABLED_WindowOpenSized
 #else
 #define MAYBE_WindowOpenSized WindowOpenSized
 #endif
 // Ensure that the width and height properties of a window opened with
 // chrome.windows.create match the creation parameters. See crbug.com/173831.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WindowOpenSized) {
+IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, MAYBE_WindowOpenSized) {
   ASSERT_TRUE(RunExtensionTest("window_open/window_size")) << message_;
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 0, 1));
 }
 
 // Tests that an extension page can call window.open to an extension URL and
 // the new window has extension privileges.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
@@ skipping 122 matching lines @@
     ASSERT_TRUE(content::ExecuteScript(
         tab, "location.href = '" + extension_url.spec() + "';"));
     observer.Wait();
     EXPECT_EQ(extension_url, tab->GetMainFrame()->GetLastCommittedURL());
     std::string result;
     ASSERT_TRUE(content::ExecuteScriptAndExtractString(
         tab, "domAutomationController.send(document.body.innerText)", &result));
     EXPECT_EQ("HOWDIE!!!", result);
   }
 }