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

Remove a host_resolver()->ClearRules call in a test body and replace it with...

Remove a host_resolver()->ClearRules call in a test body and replace it with an AddRule call that happens in SetUpOnMainThread.

This allows us to enforce that mock host resolver isn't modified in a test body.

BUG=713847

Review-Url: https://codereview.chromium.org/2854693002
Cr-Commit-Position: refs/heads/master@{#468479}
parent faf14f70
...@@ -880,6 +880,9 @@ class SavePageSitePerProcessBrowserTest : public SavePageBrowserTest { ...@@ -880,6 +880,9 @@ class SavePageSitePerProcessBrowserTest : public SavePageBrowserTest {
void SetUpOnMainThread() override { void SetUpOnMainThread() override {
SavePageBrowserTest::SetUpOnMainThread(); SavePageBrowserTest::SetUpOnMainThread();
// Used by the BrokenImage test which depends on *.no.such.host not
// resolving to 127.0.0.1
host_resolver()->AddRule("no.such.host", "128.0.0.1");
host_resolver()->AddRule("*", "127.0.0.1"); host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndListen()); ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
content::SetupCrossSiteRedirector(embedded_test_server()); content::SetupCrossSiteRedirector(embedded_test_server());
...@@ -1331,10 +1334,6 @@ IN_PROC_BROWSER_TEST_P(SavePageOriginalVsSavedComparisonTest, Style) { ...@@ -1331,10 +1334,6 @@ IN_PROC_BROWSER_TEST_P(SavePageOriginalVsSavedComparisonTest, Style) {
// - Broken, undecodable image (see also https://crbug.com/586680) // - Broken, undecodable image (see also https://crbug.com/586680)
// - Broken link, to unresolvable host (see also https://crbug.com/594219) // - Broken link, to unresolvable host (see also https://crbug.com/594219)
IN_PROC_BROWSER_TEST_P(SavePageOriginalVsSavedComparisonTest, BrokenImage) { IN_PROC_BROWSER_TEST_P(SavePageOriginalVsSavedComparisonTest, BrokenImage) {
// Clear resolver rules to make sure that *.no.such.host used in the test html
// doesn't resolve to 127.0.0.1
host_resolver()->ClearRules();
content::SavePageType save_page_type = GetParam(); content::SavePageType save_page_type = GetParam();
std::string arr[] = { std::string arr[] = {
......
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