Fix race when reloading original URL

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 9e01343db6382930805063b8321ecfb3c1242f72..42c1c0ca0be6452e5e8efe014eadddf76434a7b4 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -257,8 +257,9 @@ bool NavigatorImpl::NavigateToEntry(
 
     // Notify observers about navigation.
     if (delegate_) {
-      delegate_->DidStartNavigationToPendingEntry(frame_entry.url(),
-                                                  reload_type);
+      delegate_->DidStartNavigationToPendingEntry(
+          frame_tree_node->navigation_request()->common_params().url,

[Charlie Reis, 2015/07/08 23:23:37]

dest_url

[lfg, 2015/07/14 18:58:31]

Done.

+          reload_type);
     }
 
     return true;
@@ -291,15 +292,18 @@ bool NavigatorImpl::NavigateToEntry(
       entry.transferred_global_request_id().child_id != -1 &&
       entry.transferred_global_request_id().child_id ==
           dest_render_frame_host->GetProcess()->GetID();
+  GURL pending_url = frame_entry.url();
   if (!is_transfer_to_same) {
     navigation_data_.reset(new NavigationMetricsData(
         navigation_start, frame_entry.url(), entry.restore_type()));
     // Create the navigation parameters.
     FrameMsg_Navigate_Type::Value navigation_type =
         GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
+    CommonNavigationParams common_navigation_params =
+        entry.ConstructCommonNavigationParams(frame_entry, navigation_type);
+    pending_url = common_navigation_params.url;
     dest_render_frame_host->Navigate(
-        entry.ConstructCommonNavigationParams(frame_entry, navigation_type),
-        entry.ConstructStartNavigationParams(),
+        common_navigation_params, entry.ConstructStartNavigationParams(),
         entry.ConstructRequestNavigationParams(
             frame_entry, navigation_start, is_same_document_history_load,
             controller_->HasCommittedRealLoad(frame_tree_node),
@@ -331,7 +335,7 @@ bool NavigatorImpl::NavigateToEntry(
 
   // Notify observers about navigation.
   if (delegate_) {
-    delegate_->DidStartNavigationToPendingEntry(frame_entry.url(), reload_type);
+    delegate_->DidStartNavigationToPendingEntry(pending_url, reload_type);
   }
 
   return true;