summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host
diff options
context:
space:
mode:
authorclamy <clamy@chromium.org>2016-03-25 11:18:42 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 18:19:38 +0000
commit8fadc69163a7b48cd24ed22ddfceb30e2348c966 (patch)
tree223eb687b73ab65aa01e1aa0732b36017996121e /content/browser/frame_host
parentcac8709a0d06fee9d9f048b9e779ce59902673a5 (diff)
downloadchromium_src-8fadc69163a7b48cd24ed22ddfceb30e2348c966.zip
chromium_src-8fadc69163a7b48cd24ed22ddfceb30e2348c966.tar.gz
chromium_src-8fadc69163a7b48cd24ed22ddfceb30e2348c966.tar.bz2
PlzNavigate: fix several WebContentsImpl tests
This CL fixes several WebContentsImplTests when run with PlzNavigate by making sure they call the appropriate helper functions and having a definition of CrossSiteNavigationPending that matches the one in the current navigation codepath. BUG=439423 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1832443002 Cr-Commit-Position: refs/heads/master@{#383313}
Diffstat (limited to 'content/browser/frame_host')
-rw-r--r--content/browser/frame_host/navigator_impl_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc
index fbe1106..6c93e1f 100644
--- a/content/browser/frame_host/navigator_impl_unittest.cc
+++ b/content/browser/frame_host/navigator_impl_unittest.cc
@@ -456,7 +456,6 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) {
// Receive the beforeUnload ACK.
main_test_rfh()->SendBeforeUnloadACK(true);
EXPECT_EQ(speculative_rfh, GetSpeculativeRenderFrameHost(node));
- EXPECT_FALSE(contents()->CrossProcessNavigationPending());
scoped_refptr<ResourceResponse> response(new ResourceResponse);
GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted(
@@ -464,7 +463,6 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) {
EXPECT_EQ(speculative_rfh, GetSpeculativeRenderFrameHost(node));
EXPECT_TRUE(DidRenderFrameHostRequestCommit(speculative_rfh));
EXPECT_FALSE(DidRenderFrameHostRequestCommit(main_test_rfh()));
- EXPECT_TRUE(contents()->CrossProcessNavigationPending());
speculative_rfh->SendNavigate(0, entry_id, true, kUrl2);