PlzNavigate: add cancel navigation logic for uncommitted requests

content/browser/frame_host/navigation_request.h

Index: content/browser/frame_host/navigation_request.h
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h
index 6cc1cd2fe98b6bcaf4a44e74ae2e4f66ffeb3eca..a00b449d722022b159b5726228259c54f619fbc4 100644
--- a/content/browser/frame_host/navigation_request.h
+++ b/content/browser/frame_host/navigation_request.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/frame_host/navigation_request_info.h"
+#include "content/common/content_export.h"
 
 namespace content {
 class ResourceRequestBody;
@@ -20,19 +21,28 @@ class ResourceRequestBody;
 // the navigation following its refactoring.
 class NavigationRequest {
  public:
+

[nasko, 2014/09/02 14:10:57]

nit: no need for empty line

[carlosk, 2014/09/02 15:30:09]

Done.

   NavigationRequest(const NavigationRequestInfo& info, int64 frame_node_id);
 
   ~NavigationRequest();
 
-  const NavigationRequestInfo& info() const { return info_; }
-  int64 frame_node_id() const { return frame_node_id_; }
-
   // Called on the UI thread by the RenderFrameHostManager which owns the
   // NavigationRequest. After calling this function, |body| can no longer be
   // manipulated on the UI thread.
   void BeginNavigation(scoped_refptr<ResourceRequestBody> body);
 
+  // Called on the UI thread by the RenderFrameHostManager which owns the
+  // NavigationRequest whenever this navigation request should be canceled.
+  void CancelNavigation();
+
+  const NavigationRequestInfo& info() const { return info_; }
+
+  int64 frame_node_id() const { return frame_node_id_; }

[nasko, 2014/09/02 14:10:57]

nit: frame_tree_node_id

[carlosk, 2014/09/02 15:30:09]

Done.

+
+  int64 navigation_request_id() const { return navigation_request_id_; }
+
  private:
+  const int64 navigation_request_id_;
   const NavigationRequestInfo info_;
   const int64 frame_node_id_;