diff options
author | clamy <clamy@chromium.org> | 2016-03-23 05:31:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 12:33:10 +0000 |
commit | eeb96fdeecafcd7f6c88a87bfd2bfa8b7f12c94c (patch) | |
tree | 5bb776df3e17b2fbceabb7dab4ee7d8f69645cad | |
parent | b9f18314c220fec5b9b91409db88556234462f9b (diff) | |
download | chromium_src-eeb96fdeecafcd7f6c88a87bfd2bfa8b7f12c94c.zip chromium_src-eeb96fdeecafcd7f6c88a87bfd2bfa8b7f12c94c.tar.gz chromium_src-eeb96fdeecafcd7f6c88a87bfd2bfa8b7f12c94c.tar.bz2 |
PlzNavigate: fix SecurityExploitBrowserTest.MismatchedOriginOnCommit
This CL fixes SecurityExploitBrowserTest.MismatchedOriginOnCommit. Due to a
difference in how teh main resource request are made, a network request was
still present when the test is destroyed. This request finishes and try to
access teh StallDelegate which has already been destroyed. Resetting the
ResourceDispatcherHostDelegate before destroying the test fixes that.
BUG=475027
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1816563002
Cr-Commit-Position: refs/heads/master@{#382833}
-rw-r--r-- | content/browser/security_exploit_browsertest.cc | 1 | ||||
-rw-r--r-- | testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index 6adbafe..45117a3 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -554,6 +554,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, MismatchedOriginOnCommit) { exit_observer.Wait(); EXPECT_FALSE(exit_observer.did_exit_normally()); + ResourceDispatcherHost::Get()->SetDelegate(nullptr); } } // namespace content diff --git a/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter b/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter index f0a3a31..3d89a76 100644 --- a/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter +++ b/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter @@ -6,7 +6,6 @@ -RenderViewImplTest.GetCompositionCharacterBoundsTest -RenderViewImplTest.OnNavigationHttpPost -RenderViewImplTest.TestBackForward --SecurityExploitBrowserTest.MismatchedOriginOnCommit -ServiceWorkerBrowserTest.FetchPageWithSaveData -ServiceWorkerBrowserTest.FetchPageWithSaveDataPassThroughOnFetch -SessionHistoryTest.FrameBackForward |