PlzNavigate: add cancel navigation logic for uncommitted requests

content/browser/frame_host/render_frame_host_manager_unittest.cc

 // Copyright 2013 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.
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 1837 matching lines @@
     EXPECT_FALSE(rvh_deleted_observer.deleted());
   }
 }
 
 // Browser-side navigation: Test that a proper NavigationRequest is created by
 // BeginNavigation.
 TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
   const GURL kUrl3("http://www.gmail.com/");
+  const int64 firstNavRequestID = 1;

[clamy, 2014/08/18 11:51:24]

Please rename this variable as kFirstNavRequestId (styleguide mandates that
constant names should be prefixed with a k:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Constant_Names).

 
   // Navigate to the first page.
   contents()->NavigateAndCommit(kUrl1);
   TestRenderViewHost* rvh1 = test_rvh();
   EXPECT_EQ(RenderViewHostImpl::STATE_DEFAULT, rvh1->rvh_state());
 
   // Add a subframe.
   TestRenderFrameHost* subframe_rfh = static_cast<TestRenderFrameHost*>(
       contents()->GetFrameTree()->AddFrame(
           contents()->GetFrameTree()->root(), 14, "Child"));
 
   // Simulate a BeginNavigation IPC on the subframe.
   subframe_rfh->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* subframe_request =
       NavigationRequestForRenderFrameManager(
           subframe_rfh->frame_tree_node()->render_manager());
   ASSERT_TRUE(subframe_request);
   EXPECT_EQ(kUrl2, subframe_request->info_for_testing().navigation_params.url);
   // First party for cookies url should be that of the main frame.
   EXPECT_EQ(
       kUrl1, subframe_request->info_for_testing().first_party_for_cookies);
   EXPECT_FALSE(subframe_request->info_for_testing().is_main_frame);
   EXPECT_TRUE(subframe_request->info_for_testing().parent_is_main_frame);
+  EXPECT_EQ(firstNavRequestID, subframe_request->navigation_request_id());
 
   // Simulate a BeginNavigation IPC on the main frame.
   main_test_rfh()->SendBeginNavigationWithURL(kUrl3);
   NavigationRequest* main_request =
       NavigationRequestForRenderFrameManager(
         main_test_rfh()->frame_tree_node()->render_manager());
   ASSERT_TRUE(main_request);
   EXPECT_EQ(kUrl3, main_request->info_for_testing().navigation_params.url);
   EXPECT_EQ(kUrl3, main_request->info_for_testing().first_party_for_cookies);
   EXPECT_TRUE(main_request->info_for_testing().is_main_frame);
   EXPECT_FALSE(main_request->info_for_testing().parent_is_main_frame);
+  EXPECT_EQ(firstNavRequestID + 1, main_request->navigation_request_id());
 }
 
 }  // namespace content