summaryrefslogtreecommitdiffstats
path: root/content/test
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/test
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/test')
-rw-r--r--content/test/test_web_contents.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index c424f93..9dd81f6 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -148,10 +148,7 @@ const std::string& TestWebContents::GetSaveFrameHeaders() {
bool TestWebContents::CrossProcessNavigationPending() {
if (IsBrowserSideNavigationEnabled()) {
- return GetRenderManager()->speculative_render_frame_host_ &&
- static_cast<TestRenderFrameHost*>(
- GetRenderManager()->speculative_render_frame_host_.get())
- ->pending_commit();
+ return GetRenderManager()->speculative_render_frame_host_ != nullptr;
}
return GetRenderManager()->pending_frame_host() != nullptr;
}