PlzNavigate: make content unit tests work with browser side navigation

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index f70b5808da311d3ae0d0c68be53834ef2c510cc6..e2bdde4c9339100890cfa7221c330c39592f53dc 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -21,6 +21,7 @@
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
+#include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
@@ -874,6 +875,15 @@ void RenderFrameHostImpl::OnBeforeUnloadACK(
     render_view_host_->GetDelegate()->DidCancelLoading();
 }
 
+bool RenderFrameHostImpl::IsWaitingForBeforeUnloadACK() const {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableBrowserSideNavigation)) {
+    return is_waiting_for_beforeunload_ack_;
+  }
+  return static_cast<NavigatorImpl*>(frame_tree_node_->navigator())
+      ->IsWaitingForBeforeUnloadACK(frame_tree_node_);

[nasko, 2015/01/17 00:22:01]

Does it make sense to put this on the interface and avoid the cast here?

[clamy, 2015/01/19 17:29:20]

Tried it in the latest patch set, it may be slightly better. I'm not sure though
that I understand the precise difference between Navigator and NavigatorImpl.
Considering they are both in content/browser/frame_host and therefore not
public, why do we have both?

+}
+
 bool RenderFrameHostImpl::IsWaitingForUnloadACK() const {
   return render_view_host_->is_waiting_for_close_ack_ ||
       rfh_state_ == STATE_PENDING_SWAP_OUT;
@@ -1403,6 +1413,11 @@ void RenderFrameHostImpl::CommitNavigation(
   // TODO(clamy): Check if we have to add security checks for the browser plugin
   // guests.
 
+  // There's navigation message params waiting to be sent. Now that we're not

[nasko, 2015/01/17 00:22:01]

nit: 'params' implies 'There're'

[clamy, 2015/01/19 17:29:20]

The whole block was removed since it landed in the speculative RFH patch.

+  // suspended anymore, resume navigation by sending them. If we were swapped

[nasko, 2015/01/17 00:22:01]

We don't use suspending of navigations in PlzNavigate, do we? What are those
suspended params.

[clamy, 2015/01/19 17:29:20]

Same here.

+  // out, we should also stop filtering out the IPC messages now.
+  SetState(RenderFrameHostImpl::STATE_DEFAULT);
+
   Send(new FrameMsg_CommitNavigation(
       routing_id_, response->head, body->GetURL(),
       common_params, commit_params));