Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 1080073004: PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed compilation error Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigator_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index 03d9d065af5be512cef1d6473a5d8c03d9274009..847bbeb53d3bd3f78784558c0a2d33b0cb17b266 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -220,10 +220,8 @@ class NavigationControllerTest
bool HasNavigationRequest() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation)) {
- FrameTreeNode* root = contents()->GetFrameTree()->root();
- NavigationRequest* navigation_request = static_cast<NavigatorImpl*>(
- root->navigator())->GetNavigationRequestForNodeForTesting(root);
- return navigation_request != nullptr;
+ return contents()->GetFrameTree()->root()->navigation_request() !=
+ nullptr;
}
return process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID)
!= nullptr;
@@ -232,9 +230,8 @@ class NavigationControllerTest
const GURL GetLastNavigationURL() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation)) {
- FrameTreeNode* root = contents()->GetFrameTree()->root();
- NavigationRequest* navigation_request = static_cast<NavigatorImpl*>(
- root->navigator())->GetNavigationRequestForNodeForTesting(root);
+ NavigationRequest* navigation_request =
+ contents()->GetFrameTree()->root()->navigation_request();
CHECK(navigation_request);
return navigation_request->common_params().url;
}
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigator_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698