PlzNavigate: update Navigator tests post-removal of the RequestNavigation IPC

content/browser/frame_host/render_frame_host_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/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 1529 matching lines @@
 }
 
 void RenderFrameHostImpl::Stop() {
   Send(new FrameMsg_Stop(routing_id_));
 }
 
 void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation) {
   // TODO(creis): Support beforeunload on subframes.  For now just pretend that
   // the handler ran and allowed the navigation to proceed.
   if (GetParent() || !IsRenderFrameLive()) {
-    // We don't have a live renderer, so just skip running beforeunload.
+    // If there's no live renderer or this is a subframe navigation then just

[clamy, 2015/02/11 10:54:27]

Please remove this change. The subframe navigation case is a temporary one, as
indicated by the TODO above the if condition.

[carlosk, 2015/02/11 15:36:21]

OK, reverted as it's being updated anyway in another CL.

I made this change due to me being confused when adding NavigationRequest::state
checks to the subframe navigation in
NavigatorTestWithBrowserSideNavigation::BeginNavigation. I expected it would
have to wait for the beforeUnload ACK from the renderer but that was not the
case.

+    // skip running beforeunload.
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBrowserSideNavigation)) {
       frame_tree_node_->navigator()->OnBeforeUnloadACK(
           frame_tree_node_, true);
     } else {
       frame_tree_node_->render_manager()->OnBeforeUnloadACK(
           for_navigation, true, base::TimeTicks::Now());
     }
     return;
   }
@@ skipping 318 matching lines @@
 void RenderFrameHostImpl::DidUseGeolocationPermission() {
   RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
   GetContentClient()->browser()->RegisterPermissionUsage(
       PERMISSION_GEOLOCATION,
       delegate_->GetAsWebContents(),
       GetLastCommittedURL().GetOrigin(),
       top_frame->GetLastCommittedURL().GetOrigin());
 }
 
 }  // namespace content