PlzNavigate: properly execute BeforeUnload on renderer initiated navigations

content/browser/frame_host/navigator_impl.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 "content/browser/frame_host/navigator_impl.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 318 matching lines @@
       // and so no tracing is done.
       TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(
           "navigation", "Navigation timeToNetworkStack",
           frame_tree_node->navigation_request()->navigation_handle(),
           navigation_start.ToInternalValue(),
           "FrameTreeNode id", frame_tree_node->frame_tree_node_id());
     }
 
   } else {
     RenderFrameHostImpl* dest_render_frame_host =
-        frame_tree_node->render_manager()->Navigate(dest_url, frame_entry,
-                                                    entry);
+        frame_tree_node->render_manager()->Navigate(
+            dest_url, frame_entry, entry,
+            reload_type != NavigationController::NO_RELOAD);
     if (!dest_render_frame_host)
       return false;  // Unable to create the desired RenderFrameHost.
 
     // Make sure no code called via RFHM::Navigate clears the pending entry.
     if (is_pending_entry)
       CHECK_EQ(controller_->GetPendingEntry(), &entry);
 
     // For security, we should never send non-Web-UI URLs to a Web UI renderer.
     // Double check that here.
     CheckWebUIRendererDoesNotDisplayNormalURL(dest_render_frame_host, dest_url);
@@ skipping 645 matching lines @@
   navigation_request->CreateNavigationHandle(entry.GetUniqueID());
 
   // Have the current renderer execute its beforeunload event if needed. If it
   // is not needed (when beforeunload dispatch is not needed or this navigation
   // is synchronous and same-site) then NavigationRequest::BeginNavigation
   // should be directly called instead.
   if (should_dispatch_beforeunload &&
       ShouldMakeNetworkRequestForURL(
           navigation_request->common_params().url)) {
     navigation_request->SetWaitingForRendererResponse();
-    frame_tree_node->current_frame_host()->DispatchBeforeUnload(true);
+    frame_tree_node->current_frame_host()->DispatchBeforeUnload(
+        true, reload_type != NavigationController::NO_RELOAD);
   } else {
     navigation_request->BeginNavigation();
   }
 }
 
 void NavigatorImpl::RecordNavigationMetrics(
     const LoadCommittedDetails& details,
     const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
     SiteInstance* site_instance) {
   DCHECK(site_instance->HasProcess());
@@ skipping 128 matching lines @@
   if (pending_entry != controller_->GetVisibleEntry() ||
       !should_preserve_entry) {
     controller_->DiscardPendingEntry(true);
 
     // Also force the UI to refresh.
     controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content