Fix some unit_tests under PlzNavigate

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 "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/page_state.h"
+#include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
 TestWebContents::TestWebContents(BrowserContext* browser_context)
     : WebContentsImpl(browser_context),
       delegate_view_override_(NULL),
       expect_set_history_offset_and_length_(false),
@@ skipping 175 matching lines @@
           pending_frame_host->ResetLoadingState();
       }
     }
   }
 }
 
 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.
-  // 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. It is necessary to call PrepareForCommit before getting
-  // the main and the pending frame because when we are trying to navigate to a
-  // webui from a new tab, a RenderFrameHost is created to display it that is
-  // committed immediately (since it is a new tab). Therefore the main frame is
-  // replaced without a pending frame being created, and we don't get the right
-  // values for the RFH to navigate: we try to use the old one that has been
-  // deleted in the meantime.
-  // Note that for some synchronous navigations (about:blank, javascript
-  // urls, etc.) there will be no NavigationRequest, and no simulation of the
-  // network stack is required.
-  bool browser_side_navigation = IsBrowserSideNavigationEnabled();
-  if (!browser_side_navigation ||
-      GetMainFrame()->frame_tree_node()->navigation_request()) {
-    GetMainFrame()->PrepareForCommit();
-  }
+  TestRenderFrameHost* old_rfh = GetMainFrame();
 
-  TestRenderFrameHost* old_rfh = GetMainFrame();
+  // PlzNavigate: the pending RenderFrameHost is not created before the
+  // navigation commit, so it is necessary to simulate the IO thread response
+  // here to commit in the proper renderer. It is necessary to call
+  // PrepareForCommit before getting the main and the pending frame because when
+  // we are trying to navigate to a webui from a new tab, a RenderFrameHost is
+  // created to display it that is committed immediately (since it is a new
+  // tab). Therefore the main frame is replaced without a pending frame being
+  // created, and we don't get the right values for the RenderFrameHost to
+  // navigate: we try to use the old one that has been deleted in the meantime.
+  // Note that for some synchronous navigations (about:blank, javascript urls,
+  // etc.), no simulation of the network stack is required.
+  old_rfh->PrepareForCommitIfNecessary();
+
   TestRenderFrameHost* rfh = GetPendingMainFrame();
   if (!rfh)
     rfh = old_rfh;
+  const bool browser_side_navigation = IsBrowserSideNavigationEnabled();
   CHECK(!browser_side_navigation || rfh->is_loading());
   CHECK(!browser_side_navigation ||
         !rfh->frame_tree_node()->navigation_request());
 
   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 100 matching lines @@
                                                   int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content