| 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 c1fce3c30fec4e115e8f926bf45b66b0ef7033ca..fb0ec81af2803290d6eadef7525fd5cc73940b33 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;
|
| }
|
|
|