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 269af9215f943228470130f189116c1b93a1381d..0661cdaf5207578272f940c5b92262dfe0bd23db 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -238,11 +238,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);

[nasko, 2014/08/21 21:53:44]

nit: frame_tree_node_id. I missed to add this comment in previous reviews, so
NavigationRequest uses it, but we should probably rename it next time it is
touched.

[carlosk, 2014/08/22 13:43:03]

I'm not sure I understood you... You meant I shouldn't rename this now and let's
wait for the next time we touch this, right?

[nasko, 2014/08/22 14:00:34]

Yes.

[carlosk, 2014/08/22 16:54:41]

Acknowledged.

+
+  // PlzNavigate
+  // Called by NavigationRequest to cancel a navigation request with the
+  // provided |navigation_request_id| from the node identified by

[nasko, 2014/08/21 21:53:44]

nit: s/from/in/

[carlosk, 2014/08/22 13:43:03]

Done.

+  // |frame_node_id|.
+  void CancelNavigationRequest(int64 navigation_request_id,
+                               int64 frame_node_id);
 
  private:
   friend class ResourceDispatcherHostTest;