Ensure that all code paths which call FrameTreeNode::ResetNavigationRequest set NavigationHandle::G…

content/browser/cross_site_transfer_browsertest.cc

 // 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.
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
+#include "content/public/test/navigation_handle_observer.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
 #include "content/test/content_browser_test_utils_internal.h"
 #include "net/base/escape.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 386 matching lines @@
   // Navigate to a page on A.com with entry replacement. This navigation is
   // cross-site, so the renderer will send it to the browser via OpenURL to give
   // to a new process. It will then be transferred into yet another process due
   // to the call above.
   GURL url2 =
       embedded_test_server()->GetURL("A.com", "/site_isolation/blank.html?2");
   // Used to make sure the second request is cancelled, and there is only one
   // request for url2.
   tracking_delegate().SetTrackedURL(url2);
 
+  NavigationHandleObserver handle_observer(shell()->web_contents(), url2);
   // Don't wait for the navigation to complete, since that never happens in
   // this case.
   NavigateToURLContentInitiated(shell(), url2, false, false);
 
   // There should be one history entry, with url1.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetCurrentEntryIndex());
   EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL());
 
   // Make sure the request for url2 did not complete.
   EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted());
 
+  EXPECT_EQ(net::ERR_ABORTED, handle_observer.net_error_code());
   shell()->web_contents()->SetDelegate(old_delegate);
 }
 
 // Test that verifies that a cross-process transfer retains ability to read
 // files encapsulated by HTTP POST body that is forwarded to the new renderer.
 // Invalid handling of this scenario has been suspected as the cause of at least
 // some of the renderer kills tracked in https://crbug.com/613260.
 IN_PROC_BROWSER_TEST_P(CrossSiteTransferTest, PostWithFileData) {
   // Navigate to the page with form that posts via 307 redirection to
   // |redirect_target_url| (cross-site from |form_url|).  Using 307 (rather than
@@ skipping 57 matching lines @@
   EXPECT_THAT(actual_page_body,
               ::testing::HasSubstr("form-data; name=\"file\""));
 }
 
 INSTANTIATE_TEST_CASE_P(CrossSiteTransferTest,
                         CrossSiteTransferTest,
                         ::testing::Values(TestParameter::LOADING_WITHOUT_MOJO,
                                           TestParameter::LOADING_WITH_MOJO));
 
 }  // namespace content