PlzNavigate: have renderer-initiated navigations be same-process

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 "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 391 matching lines @@
     // HACK!!  This code suppresses javascript: URLs from being added to
     // session history, which is what we want to do for javascript: URLs that
     // do not generate content.  What we really need is a message from the
     // renderer telling us that a new page was not created.  The same message
     // could be used for mailto: URLs and the like.
     if (entry.GetURL().SchemeIs(url::kJavaScriptScheme))
       return false;
   }
 
   // Notify observers about navigation.
-  if (delegate_) {
-    delegate_->DidStartNavigationToPendingEntry(dest_render_frame_host,
-                                                entry.GetURL(),
-                                                reload_type);
-  }
+  if (delegate_)
+    delegate_->DidStartNavigationToPendingEntry(entry.GetURL(), reload_type);
 
   return true;
 }
 
 bool NavigatorImpl::NavigateToPendingEntry(
     FrameTreeNode* frame_tree_node,
     NavigationController::ReloadType reload_type) {
   return NavigateToEntry(
       frame_tree_node,
       *NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry()),
@@ skipping 425 matching lines @@
   // If there is an ongoing request, replace it.
   navigation_request_map_.set(frame_tree_node_id, navigation_request.Pass());
 
   // Have the current renderer execute its beforeUnload event if needed. If it
   // is not needed (eg. the renderer is not live), BeginNavigation should get
   // called.
   NavigationRequest* request_to_send =
       navigation_request_map_.get(frame_tree_node_id);
   request_to_send->SetWaitingForRendererResponse();
   frame_tree_node->current_frame_host()->DispatchBeforeUnload(true);
+
+  if (delegate_)

[clamy, 2015/02/23 10:52:34]

As in the comment in the header file, I don't think this is necessary for this
patch, and would prefer to have it in another CL.

[carlosk, 2015/03/04 19:42:40]

Change was moved to another CL.

+    delegate_->DidStartNavigationToPendingEntry(entry.GetURL(), reload_type);
 }
 
 void NavigatorImpl::BeginNavigation(FrameTreeNode* frame_tree_node) {
   NavigationRequest* navigation_request =
       navigation_request_map_.get(frame_tree_node->frame_tree_node_id());
 
   // A browser-initiated navigation could have been cancelled while it was
   // waiting for the BeforeUnload event to execute.
   if (!navigation_request)
     return;
@@ skipping 54 matching lines @@
         "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_commit);
     UMA_HISTOGRAM_TIMES(
         "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_network);
   }
   navigation_data_.reset();
 }
 
 }  // namespace content