PlzNavigate: add cancel navigation logic for uncommitted requests

content/browser/loader/resource_dispatcher_host_impl.h

Index: content/browser/loader/resource_dispatcher_host_impl.h
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index 45fbaa52338685b1279aa8a74aeda426c264217a..43f73e72b2fbd6213583c4d3965c488dcd4c8d54 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -222,7 +222,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
 
   // Must be called after the ResourceRequestInfo has been created
   // and associated with the request.  If |payload| is set to a non-empty value,
-  // the value will be sent to the old resource handler instead of cancelling
+  // the value will be sent to the old resource handler instead of canceling
   // it, except on HTTP errors.
   scoped_ptr<ResourceHandler> MaybeInterceptAsStream(
       net::URLRequest* request,
@@ -244,11 +244,20 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // elsewhere.
   void FinishedWithResourcesForRequest(const net::URLRequest* request_);
 
+  // PlzNavigate
   // Called by NavigationRequest to start a navigation request in the node
   // identified by |frame_node_id|.
-  void NavigationRequest(const NavigationRequestInfo& info,
-                         scoped_refptr<ResourceRequestBody> request_body,
-                         int64 frame_node_id);
+  void StartNavigationRequest(const NavigationRequestInfo& info,
+                              scoped_refptr<ResourceRequestBody> request_body,
+                              int64 navigation_request_id,
+                              int64 frame_node_id);
+
+  // PlzNavigate
+  // Called by NavigationRequest to cancel a navigation request with the
+  // provided |navigation_request_id| in the node identified by
+  // |frame_node_id|.
+  void CancelNavigationRequest(int64 navigation_request_id,
+                               int64 frame_node_id);
 
  private:
   friend class ResourceDispatcherHostTest;