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

Revert of PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode (patchset #5 id:80001 of https://codereview.chromium.org/1080073004/)

Reason for revert:
Tentative revert to try to fix fast/dom/Window/new-window-opener.html on Mac, which has been crashing consistently since http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.9/builds/18168

Original issue's description:
> PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode
> 
> This CL moves the ownership of NavigationRequests from a map in NavigatorImpl
> to the FrameTreeNode. This ensures that NavigationRequests are unique per
> FrameTreeNode and are also properly deleted on destruction of the
> FrameTreeNode. It also makes it easier to have PlzNavigate adapt to the
> refactoring of DidStart/StopLoading happening in
> https://codereview.chromium.org/1080143003/.
> 
> BUG=439423
> 
> Committed: https://crrev.com/dcb434c11019afedcd5e45820e724b8ad9e6d396
> Cr-Commit-Position: refs/heads/master@{#325498}

TBR=nasko@chromium.org,fdegans@chromium.org,carlosk@chromium.org,clamy@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=439423

[johnme, 2015-04-17 15:57:00]

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

[commit-bot: I haz the power, 2015-04-17 15:57:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1092973002/1

[commit-bot: I haz the power, 2015-04-17 15:59:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-17 15:59:32]

Failed to apply patch for content/browser/frame_host/frame_tree_node.cc:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/frame_host/frame_tree_node.cc:9
  Falling back to three-way merge...
  Applied patch to 'content/browser/frame_host/frame_tree_node.cc' with
conflicts.
  U content/browser/frame_host/frame_tree_node.cc

Patch:       content/browser/frame_host/frame_tree_node.cc
Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc
b/content/browser/frame_host/frame_tree_node.cc
index
4a0db77650e2671ddbad1a3bd49d12d14e9fa7cd..daf4a71255d6b8a9c6f30493364f25644dd18620
100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
-#include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ -72,6 +71,10 @@
   frame_tree_->FrameRemoved(this);
 
   g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation)) {
+    navigator_->CancelNavigation(this);
+  }
 }
 
 bool FrameTreeNode::IsMainFrame() const {
@@ -171,27 +174,4 @@
   return did_change_flags;
 }
 
-void FrameTreeNode::SetNavigationRequest(
-    scoped_ptr<NavigationRequest> navigation_request) {
-  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableBrowserSideNavigation));
-  ResetNavigationRequest(false);
-  // TODO(clamy): perform the StartLoading logic here.
-  navigation_request_ = navigation_request.Pass();
-}
-
-void FrameTreeNode::ResetNavigationRequest(bool is_commit) {
-  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableBrowserSideNavigation));
-  // Upon commit the current NavigationRequest will be reset. There should be
no
-  // cleanup performed since the navigation is still ongoing. If the reset
-  // corresponds to a cancelation, the RenderFrameHostManager should clean up
-  // any speculative RenderFrameHost it created for the navigation.
-  if (navigation_request_ && !is_commit) {
-    // TODO(clamy): perform the StopLoading logic.
-    render_manager_.CleanUpNavigation();
-  }
-  navigation_request_.reset();
-}
-
 }  // namespace content

[commit-bot: I haz the power, 2015-04-17 16:00:53]

The CQ bit was unchecked by commit-bot@chromium.org

[clamy, 2015-04-17 16:57:12]

Hey John, I think it is unlikely that my CL is the cause of failure of the bot.
This CL only contains code that should be executed with a specific flag on. In
particular this flag is not passed to any bot except the fyi bot Browser Side
Navigation Linux. So it should absolutely note execute on any Blink bot (they
are CHECKs in the code to enforce that). Also note that
https://codereview.chromium.org/1080143003/ landed in the meantime and was
rebased on top of this patch.

[schenney, 2015-04-17 19:49:39]

On 2015/04/17 16:57:12, clamy wrote:
> Hey John, I think it is unlikely that my CL is the cause of failure of the
bot.
> This CL only contains code that should be executed with a specific flag on. In
> particular this flag is not passed to any bot except the fyi bot Browser Side
> Navigation Linux. So it should absolutely note execute on any Blink bot (they
> are CHECKs in the code to enforce that). Also note that
> https://codereview.chromium.org/1080143003/ landed in the meantime and was
> rebased on top of this patch.

I agree. I think the crashes may be due to the same thing that is causing
browser_test failures.