PlzNavigate: make content unit tests work with browser side navigation

content/test/test_web_contents.cc

 // Copyright (c) 2012 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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "content/browser/browser_url_handler_impl.h"
@@ skipping 123 matching lines @@
   // LoadURL created a navigation entry, now simulate the RenderView sending
   // a notification that it actually navigated.
   CommitPendingNavigation();
 }
 
 void TestWebContents::TestSetIsLoading(bool value) {
   SetIsLoading(GetRenderViewHost(), value, true, NULL);
 }
 
 void TestWebContents::CommitPendingNavigation() {
+  const NavigationEntry* entry = GetController().GetPendingEntry();
+  DCHECK(entry);
+
   // If we are doing a cross-site navigation, this simulates the current RFH
   // notifying that it has unloaded so the pending RFH is resumed and can
   // navigate.
-  TestRenderFrameHost* old_rfh = GetMainFrame();
-  const NavigationEntry* entry = GetController().GetPendingEntry();
-  DCHECK(entry);
-
-  // Simulate the BeforeUnload ACK if necessary.
   // PlzNavigate: the pending RFH is not created before the navigation commit,
   // so it is necessary to simulate the IO thread response here to commit in the
   // proper renderer.
-  old_rfh->PrepareForCommit(entry->GetURL());
+  GetMainFrame()->PrepareForCommit(entry->GetURL());

[clamy, 2015/01/13 12:41:59]

There is exactly the same problem of the webui RFH being committed immediately
on creation as mentioned in render_frame_host_manager.cc, hence the reordering
of function calls.

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

Acknowledged.

 
+  TestRenderFrameHost* old_rfh = GetMainFrame();
   TestRenderFrameHost* rfh = GetPendingMainFrame();
   if (!rfh)
     rfh = old_rfh;
 
   int page_id = entry->GetPageID();
   if (page_id == -1) {
     // It's a new navigation, assign a never-seen page id to it.
     page_id = GetMaxPageIDForSiteInstance(rfh->GetSiteInstance()) + 1;
   }
 
@@ skipping 84 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content