PlzNavigate: track pending commits

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index f19fe90633e703704c7cdc1bc39a2844a4fc747f..08e41958a81790e08c4c96c00c9b0e20fe3a3a7d 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -457,8 +457,7 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
     bool was_caused_by_user_gesture) {
   // Note: In PlzNavigate |cross_navigation_pending_| being false means there is

[nasko, 2015/04/15 21:12:45]

Since cross_navigation_pending_ is not used in PlzNavigate, this comment doesn't
seem valid any longer.

[clamy, 2015/04/16 13:18:35]

Done.

   // *no* speculative RenderFrameHost set.
-  if (!cross_navigation_pending_) {
-    DCHECK(!speculative_render_frame_host_);
+  if (!cross_navigation_pending_ && !speculative_render_frame_host_) {
     DCHECK(!pending_render_frame_host_);
     DCHECK_IMPLIES(should_reuse_web_ui_, web_ui_);
 
@@ -828,7 +827,6 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(
     }
   }
 
-  cross_navigation_pending_ = navigation_rfh != render_frame_host_.get();
   return navigation_rfh;
 }