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

content/browser/frame_host/navigator_impl.h

Index: content/browser/frame_host/navigator_impl.h
diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h
index 3c46500f8afe1ee55831e6c7542be3f9226e3376..301a758f4f14796358e8cebbbe4f81dd74194515 100644
--- a/content/browser/frame_host/navigator_impl.h
+++ b/content/browser/frame_host/navigator_impl.h
@@ -88,6 +88,11 @@
   void CancelNavigation(FrameTreeNode* frame_tree_node) override;
   bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node) override;
 
+  // PlzNavigate
+  // Returns the navigation request for a given node. Used in tests.
+  NavigationRequest* GetNavigationRequestForNodeForTesting(
+      FrameTreeNode* frame_tree_node);
+
  private:
   // Holds data used to track browser side navigation metrics.
   struct NavigationMetricsData;
@@ -137,6 +142,11 @@
 
   scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
 
+  // PlzNavigate: used to track the various ongoing NavigationRequests in the
+  // different FrameTreeNodes, based on the frame_tree_node_id.
+  typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
+  NavigationRequestMap navigation_request_map_;
+
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };