PlzNavigate: preserve SourceLocation when navigating

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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/navigation_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 508 matching lines @@
   // Select an appropriate renderer to commit the navigation.
   RenderFrameHostImpl* render_frame_host = nullptr;
   if (response_should_be_rendered_) {
     render_frame_host =
         frame_tree_node_->render_manager()->GetFrameHostForNavigation(*this);
     NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(
         render_frame_host, common_params_.url);
   }
   DCHECK(render_frame_host || !response_should_be_rendered_);
 
-  // For renderer-initiated navigations that are set to commit in a different
-  // renderer, allow the embedder to cancel the transfer.
   if (!browser_initiated_ && render_frame_host &&
-      render_frame_host != frame_tree_node_->current_frame_host() &&
-      !frame_tree_node_->navigator()->GetDelegate()->ShouldTransferNavigation(
-          frame_tree_node_->IsMainFrame())) {
-    frame_tree_node_->ResetNavigationRequest(false);
-    return;
+      render_frame_host != frame_tree_node_->current_frame_host()) {
+    // Reset the source location information if the navigation will not commit
+    // in the current renderer process. This information originated in another
+    // process (the current one), it should not be transferred to the new one.
+    common_params_.source_location.reset();
+
+    // Allow the embedder to cancel the cross-process commit if needed.
+    // TODO(clamy): Rename ShouldTransferNavigation once PlzNavigate ships.
+    if (!frame_tree_node_->navigator()->GetDelegate()->ShouldTransferNavigation(
+            frame_tree_node_->IsMainFrame())) {
+      frame_tree_node_->ResetNavigationRequest(false);
+      return;
+    }
   }
 
   if (navigation_data)
     navigation_handle_->set_navigation_data(std::move(navigation_data));
 
   // Store the response and the StreamHandle until checks have been processed.
   response_ = response;
   body_ = std::move(body);
 
   // Check if the navigation should be allowed to proceed.
@@ skipping 227 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content