PlzNavigate: add cancel navigation logic for uncommitted requests

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 220 matching lines @@
   // sending it to the renderer. Returns true if there are enough file
   // descriptors available for the shared memory buffer. If false is returned,
   // the request should cancel.
   bool HasSufficientResourcesForRequest(const net::URLRequest* request_);
 
   // Called by a ResourceHandler after it has finished its request and is done
   // using its shared memory buffer. Frees up that file descriptor to be used
   // 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;
 
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            TestBlockedRequestsProcessDies);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            CalculateApproximateMemoryCost);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DetachableResourceTimesOut);
@@ skipping 260 matching lines @@
   DelegateMap delegate_map_;
 
   scoped_ptr<ResourceScheduler> scheduler_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_