Commit a9cfcb53 authored by jam's avatar jam Committed by Commit bot

Update a host_resolver()->AddRule in chrome/browser that I missed earlier.

Part 3/2.

BUG=713847

Review-Url: https://codereview.chromium.org/2856593002
Cr-Commit-Position: refs/heads/master@{#468432}
parent 920c2686
...@@ -181,6 +181,12 @@ class ProcessManagerBrowserTest : public ExtensionBrowserTest { ...@@ -181,6 +181,12 @@ class ProcessManagerBrowserTest : public ExtensionBrowserTest {
ProcessManagerBrowserTest() { ProcessManagerBrowserTest() {
guest_view::GuestViewManager::set_factory_for_testing(&factory_); guest_view::GuestViewManager::set_factory_for_testing(&factory_);
} }
void SetUpOnMainThread() override {
ExtensionBrowserTest::SetUpOnMainThread();
host_resolver()->AddRule("*", "127.0.0.1");
}
// Create an extension with web-accessible frames and an optional background // Create an extension with web-accessible frames and an optional background
// page. // page.
const Extension* CreateExtension(const std::string& name, const Extension* CreateExtension(const std::string& name,
...@@ -424,7 +430,6 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, HttpHostMatchingExtensionId) { ...@@ -424,7 +430,6 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, HttpHostMatchingExtensionId) {
// Set up a test server running at http://[extension-id] // Set up a test server running at http://[extension-id]
ASSERT_TRUE(extension.get()); ASSERT_TRUE(extension.get());
const std::string& aliased_host = extension->id(); const std::string& aliased_host = extension->id();
host_resolver()->AddRule(aliased_host, "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url = GURL url =
embedded_test_server()->GetURL("/extensions/test_file_with_body.html"); embedded_test_server()->GetURL("/extensions/test_file_with_body.html");
...@@ -1229,8 +1234,6 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, ...@@ -1229,8 +1234,6 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest,
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; return;
host_resolver()->AddRule("*", "127.0.0.1");
// Create a simple extension without a background page. // Create a simple extension without a background page.
const Extension* extension = CreateExtension("Extension", false); const Extension* extension = CreateExtension("Extension", false);
embedded_test_server()->ServeFilesFromDirectory(extension->path()); embedded_test_server()->ServeFilesFromDirectory(extension->path());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment