Revert of PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode

content/test/test_render_frame_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/test_render_frame_host.h"
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 216 matching lines @@
 void TestRenderFrameHost::PrepareForCommitWithServerRedirect(
     const GURL& redirect_url) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     // Non PlzNavigate
     SendBeforeUnloadACK(true);
     return;
   }
 
   // PlzNavigate
-  NavigationRequest* request = frame_tree_node_->navigation_request();
+  NavigationRequest* request =
+      static_cast<NavigatorImpl*>(frame_tree_node_->navigator())
+          ->GetNavigationRequestForNodeForTesting(frame_tree_node_);
   CHECK(request);
 
   // Simulate a beforeUnload ACK from the renderer if the browser is waiting for
   // it. If it runs it will update the request state.
   if (request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE)
     SendBeforeUnloadACK(true);
 
   // If a network request is not needed for this URL, just check the request is
   // in the correct state and return.
   if (!request->ShouldMakeNetworkRequest(request->common_params().url)) {
@@ skipping 12 matching lines @@
     url_loader->SimulateServerRedirect(redirect_url);
 
   // Simulate the network stack commit.
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   // TODO(carlosk): ideally with PlzNavigate it should be possible someday to
   // fully commit the navigation at this call to CallOnResponseStarted.
   url_loader->CallOnResponseStarted(response, MakeEmptyStream());
 }
 
 }  // namespace content