PlzNavigate: add cancel navigation logic for uncommitted requests

content/browser/frame_host/navigation_request.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 
 namespace content {
 class ResourceRequestBody;
 
 // PlzNavigate
 // A UI thread object that owns a navigation request until it commits. It
 // ensures the UI thread can start a navigation request in the
 // ResourceDispatcherHost (that lives on the IO thread).
 // TODO(clamy): Describe the interactions between the UI and IO thread during
 // the navigation following its refactoring.
 class NavigationRequest {
  public:
   NavigationRequest(const NavigationRequestInfo& info, int64 frame_node_id);
 
   ~NavigationRequest();
 
   const NavigationRequestInfo& info() const { return info_; }

[clamy, 2014/08/28 12:17:01]

Why did you move those methods?

[carlosk, 2014/09/01 13:37:22]

I just wanted to group the accessors/getters altogether in a single group; it
seemed easier to read the file this way. WDYT?

   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);
 
+  int64 navigation_request_id() const { return navigation_request_id_; }
+
  private:
+  // The next available browser-global navigation request ID.
+  static int64 next_navigation_request_id_;

[davidben, 2014/08/25 17:31:34]

Nit: This may as well be a global in navigation_request.cc and not in the header
file.

[carlosk, 2014/08/27 15:31:59]

Done.

+
+  const int64 navigation_request_id_;
   const NavigationRequestInfo info_;
   const int64 frame_node_id_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_