Create NavigationHandle after beforeunload with PlzNavigate.

content/browser/frame_host/navigation_handle_impl_browsertest.cc

 // Copyright 2016 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/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 1049 matching lines @@
       std::string("/server-redirect?") + kChromeUINetworkErrorsListingURL);
   NavigationHandleObserver observer(shell()->web_contents(), redirect_url);
   TestNavigationObserver same_tab_observer(shell()->web_contents(), 1);
   EXPECT_TRUE(
       ExecuteScript(shell(), base::StringPrintf("location.href = '%s';",
                                                 redirect_url.spec().c_str())));
   same_tab_observer.Wait();
   EXPECT_EQ(net::ERR_ABORTED, observer.net_error_code());
 }
 
-// Tests that when a navigation is aborted (i.e. because of beforeunload), the
-// right error code is set on the NavigationHandle.
-IN_PROC_BROWSER_TEST_F(NavigationHandleImplBrowserTest,
-                       ErrorCodeOnAbortedNavigation) {
-  // Without PlzNavigate, NavigationHandles aren't created until after the
-  // beforeunload handler runs.
-  if (!IsBrowserSideNavigationEnabled())
-    return;
-  GURL url(
-      embedded_test_server()->GetURL("/render_frame_host/beforeunload.html"));
-  EXPECT_TRUE(NavigateToURL(shell(), url));
-
-  GURL new_url("/title1.html");
-  NavigationHandleObserver observer(shell()->web_contents(), new_url);
-  TestNavigationManager navigation_waiter(shell()->web_contents(), new_url);
-  PrepContentsForBeforeUnloadTest(shell()->web_contents());
-  SetShouldProceedOnBeforeUnload(shell(), false);
-
-  shell()->LoadURL(new_url);
-  WaitForAppModalDialog(shell());
-  static_cast<WebContentsImpl*>(shell()->web_contents())
-      ->CancelModalDialogsForRenderManager();
-  navigation_waiter.WaitForNavigationFinished();
-  EXPECT_EQ(net::ERR_ABORTED, observer.net_error_code());
-}
-
 // This class allows running tests with PlzNavigate enabled, regardless of
 // default test configuration.
 class PlzNavigateNavigationHandleImplBrowserTest : public ContentBrowserTest {
  public:
   PlzNavigateNavigationHandleImplBrowserTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnableBrowserSideNavigation);
   }
 
@@ skipping 119 matching lines @@
     NavigationHandleObserver observer(shell()->web_contents(), error_url);
     EXPECT_FALSE(NavigateToURL(shell(), error_url));
     EXPECT_TRUE(observer.has_committed());
     EXPECT_TRUE(observer.is_error());
     EXPECT_NE(site_instance,
               shell()->web_contents()->GetMainFrame()->GetSiteInstance());
   }
 }
 
 }  // namespace content