Fix for the NavigationControllerTest.BackSubframe test failures with PlzNavigate

content/test/test_render_frame_host.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/test/test_render_frame_host.h"
 
 #include "base/guid.h"
+#include "base/strings/nullable_string16.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.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/web_contents/web_contents_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/common/frame_owner_properties.h"
+#include "content/common/page_state_serialization.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/test/test_navigation_url_loader.h"
 #include "content/test/test_render_view_host.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "net/base/load_flags.h"
 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
@@ skipping 316 matching lines @@
   params.origin = origin;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
   params.was_within_same_page =
       !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
       !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_TYPED) &&
       url_copy.ReplaceComponents(replacements) ==
           GetLastCommittedURL().ReplaceComponents(replacements);
 
-  params.page_state =
-      PageState::CreateForTesting(url_copy, false, nullptr, nullptr);
-
+  params.page_state = TestRenderFrameHost::CreatePageStateForURL(
+      url_copy, params.item_sequence_number, params.document_sequence_number);
   if (!callback.is_null())
     callback.Run(&params);
 
   SendNavigateWithParams(&params);
 }
 
 void TestRenderFrameHost::SendNavigateWithParams(
     FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
   FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), *params);
   OnDidCommitProvisionalLoad(msg);
@@ skipping 92 matching lines @@
 }
 
 WebBluetoothServiceImpl*
 TestRenderFrameHost::CreateWebBluetoothServiceForTesting() {
   WebBluetoothServiceImpl* service =
       RenderFrameHostImpl::CreateWebBluetoothService(
           blink::mojom::WebBluetoothServiceRequest());
   return service;
 }
 
+// static
+PageState TestRenderFrameHost::CreatePageStateForURL(
+    const GURL& url,
+    int64_t item_sequence_number,
+    int64_t document_sequence_number) {
+  content::ExplodedPageState page_state;
+  page_state.top.url_string =
+    base::NullableString16(base::UTF8ToUTF16(url.spec()), false);
+  page_state.top.item_sequence_number = item_sequence_number;
+  page_state.top.document_sequence_number = document_sequence_number;
+
+  std::string encoded_page_state;
+  EncodePageState(page_state, &encoded_page_state);
+  return PageState::CreateFromEncodedData(encoded_page_state);

[nasko, 2016/09/07 23:21:59]

This code looks fine, but why can't this remain a method on PageState?
PageState::CreateForTesting looks much more targeted and clear.

[ananta, 2016/09/07 23:58:44]

Added a new method CreateForTestingWithSequenceNumbers to the PageState class.

+}
+
+
 int32_t TestRenderFrameHost::ComputeNextPageID() {
   const NavigationEntryImpl* entry = static_cast<NavigationEntryImpl*>(
       frame_tree_node()->navigator()->GetController()->GetPendingEntry());
   DCHECK(!(entry && entry->site_instance()) ||
          entry->site_instance() == GetSiteInstance());
   // Entry can be null when committing an error page (the pending entry was
   // cleared during DidFailProvisionalLoad).
   int page_id = entry ? entry->GetPageID() : -1;
   if (page_id == -1) {
     WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
     page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
   }
   return page_id;
 }
 
 void TestRenderFrameHost::SimulateWillStartRequest(
     ui::PageTransition transition) {
   // PlzNavigate: NavigationHandle::WillStartRequest has already been called at
   // this point.
   if (!navigation_handle() || IsBrowserSideNavigationEnabled())
     return;
   navigation_handle()->CallWillStartRequestForTesting(
       false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
       true /* user_gesture */, transition, false /* is_external_protocol */);
 }
 
 }  // namespace content