PlzNavigate: implement CommitNavigation on the browser side

content/renderer/render_view_browsertest.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 348 matching lines @@
   ExecuteJavaScript("document.getElementById('elt_text').value = 'foo';");
   ProcessPendingMessages();
   EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID));
 }
 
 TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
   FrameMsg_Navigate_Params nav_params;
 
   // An http url will trigger a resource load so cannot be used here.
-  nav_params.url = GURL("data:text/html,<div>Page</div>");
-  nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  nav_params.transition = PAGE_TRANSITION_TYPED;
-  nav_params.page_id = -1;
-  nav_params.is_post = true;
-  nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  nav_params.core_params.url = GURL("data:text/html,<div>Page</div>");
+  nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  nav_params.core_params.transition = PAGE_TRANSITION_TYPED;
+  nav_params.commit_params.page_id = -1;
+  nav_params.request_params.is_post = true;
+  nav_params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
 
   // Set up post data.
   const unsigned char* raw_data = reinterpret_cast<const unsigned char*>(
       "post \0\ndata");
   const unsigned int length = 11;
   const std::vector<unsigned char> post_data(raw_data, raw_data + length);
-  nav_params.browser_initiated_post_data = post_data;
+  nav_params.request_params.browser_initiated_post_data = post_data;
 
   frame()->OnNavigate(nav_params);
   ProcessPendingMessages();
 
   const IPC::Message* frame_navigate_msg =
       render_thread_->sink().GetUniqueMessageMatching(
           FrameHostMsg_DidCommitProvisionalLoad::ID);
   EXPECT_TRUE(frame_navigate_msg);
 
   FrameHostMsg_DidCommitProvisionalLoad::Param host_nav_params;
@@ skipping 172 matching lines @@
   // an ACK, even if we don't have to do anything else.
   render_thread_->sink().ClearMessages();
   view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
   const IPC::Message* msg2 = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg2);
 
   // If we navigate back to this RenderView, ensure we don't send a state
   // update for the swapped out URL.  (http://crbug.com/72235)
   FrameMsg_Navigate_Params nav_params;
-  nav_params.url = GURL("data:text/html,<div>Page B</div>");
-  nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  nav_params.transition = PAGE_TRANSITION_TYPED;
-  nav_params.current_history_list_length = 1;
-  nav_params.current_history_list_offset = 0;
-  nav_params.pending_history_list_offset = 1;
-  nav_params.page_id = -1;
-  nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  nav_params.core_params.url = GURL("data:text/html,<div>Page B</div>");
+  nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  nav_params.core_params.transition = PAGE_TRANSITION_TYPED;
+  nav_params.commit_params.current_history_list_length = 1;
+  nav_params.commit_params.current_history_list_offset = 0;
+  nav_params.commit_params.pending_history_list_offset = 1;
+  nav_params.commit_params.page_id = -1;
+  nav_params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(nav_params);
   ProcessPendingMessages();
   const IPC::Message* msg3 = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID);
   EXPECT_FALSE(msg3);
 }
 
 // Ensure the RenderViewImpl reloads the previous page if a reload request
 // arrives while it is showing swappedout://.  http://crbug.com/143155.
 TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
@@ skipping 10 matching lines @@
   ASSERT_TRUE(msg_A);
   ViewHostMsg_UpdateState::Param params;
   ViewHostMsg_UpdateState::Read(msg_A, &params);
   int page_id_A = params.a;
   PageState state_A = params.b;
   EXPECT_EQ(1, page_id_A);
   render_thread_->sink().ClearMessages();
 
   // Back to page A (page_id 1) and commit.
   FrameMsg_Navigate_Params params_A;
-  params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_A.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_A.current_history_list_length = 2;
-  params_A.current_history_list_offset = 1;
-  params_A.pending_history_list_offset = 0;
-  params_A.page_id = 1;
-  params_A.page_state = state_A;
-  params_A.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_A.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_A.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_A.commit_params.current_history_list_length = 2;
+  params_A.commit_params.current_history_list_offset = 1;
+  params_A.commit_params.pending_history_list_offset = 0;
+  params_A.commit_params.page_id = 1;
+  params_A.commit_params.page_state = state_A;
+  params_A.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_A);
   ProcessPendingMessages();
 
   // Respond to a swap out request.
   view()->GetMainRenderFrame()->OnSwapOut(kProxyRoutingId);
 
   // Check for a OnSwapOutACK.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg);
   render_thread_->sink().ClearMessages();
 
   // It is possible to get a reload request at this point, containing the
   // params.page_state of the initial page (e.g., if the new page fails the
   // provisional load in the renderer process, after we unload the old page).
   // Ensure the old page gets reloaded, not swappedout://.
   FrameMsg_Navigate_Params nav_params;
-  nav_params.url = GURL("data:text/html,<div>Page A</div>");
-  nav_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
-  nav_params.transition = PAGE_TRANSITION_RELOAD;
-  nav_params.current_history_list_length = 2;
-  nav_params.current_history_list_offset = 0;
-  nav_params.pending_history_list_offset = 0;
-  nav_params.page_id = 1;
-  nav_params.page_state = state_A;
-  nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  nav_params.core_params.url = GURL("data:text/html,<div>Page A</div>");
+  nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
+  nav_params.core_params.transition = PAGE_TRANSITION_RELOAD;
+  nav_params.commit_params.current_history_list_length = 2;
+  nav_params.commit_params.current_history_list_offset = 0;
+  nav_params.commit_params.pending_history_list_offset = 0;
+  nav_params.commit_params.page_id = 1;
+  nav_params.commit_params.page_state = state_A;
+  nav_params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(nav_params);
   ProcessPendingMessages();
 
   // Verify page A committed, not swappedout://.
   const IPC::Message* frame_navigate_msg =
       render_thread_->sink().GetUniqueMessageMatching(
           FrameHostMsg_DidCommitProvisionalLoad::ID);
   EXPECT_TRUE(frame_navigate_msg);
 
   // Read URL out of the parent trait of the params object.
@@ skipping 51 matching lines @@
   ASSERT_TRUE(msg_C);
   ViewHostMsg_UpdateState::Read(msg_C, &param);
   int page_id_C = param.a;
   PageState state_C = param.b;
   EXPECT_EQ(3, page_id_C);
   EXPECT_NE(state_B, state_C);
   render_thread_->sink().ClearMessages();
 
   // Go back to C and commit, preparing for our real test.
   FrameMsg_Navigate_Params params_C;
-  params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_C.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_C.current_history_list_length = 4;
-  params_C.current_history_list_offset = 3;
-  params_C.pending_history_list_offset = 2;
-  params_C.page_id = 3;
-  params_C.page_state = state_C;
-  params_C.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_C.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_C.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_C.commit_params.current_history_list_length = 4;
+  params_C.commit_params.current_history_list_offset = 3;
+  params_C.commit_params.pending_history_list_offset = 2;
+  params_C.commit_params.page_id = 3;
+  params_C.commit_params.page_state = state_C;
+  params_C.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_C);
   ProcessPendingMessages();
   render_thread_->sink().ClearMessages();
 
   // Go back twice quickly, such that page B does not have a chance to commit.
   // This leads to two changes to the back/forward list but only one change to
   // the RenderView's page ID.
 
   // Back to page B (page_id 2), without committing.
   FrameMsg_Navigate_Params params_B;
-  params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_B.current_history_list_length = 4;
-  params_B.current_history_list_offset = 2;
-  params_B.pending_history_list_offset = 1;
-  params_B.page_id = 2;
-  params_B.page_state = state_B;
-  params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_B.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_B.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_B.commit_params.current_history_list_length = 4;
+  params_B.commit_params.current_history_list_offset = 2;
+  params_B.commit_params.pending_history_list_offset = 1;
+  params_B.commit_params.page_id = 2;
+  params_B.commit_params.page_state = state_B;
+  params_B.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_B);
 
   // Back to page A (page_id 1) and commit.
   FrameMsg_Navigate_Params params;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_B.current_history_list_length = 4;
-  params_B.current_history_list_offset = 2;
-  params_B.pending_history_list_offset = 0;
-  params.page_id = 1;
-  params.page_state = state_A;
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_B.commit_params.current_history_list_length = 4;
+  params_B.commit_params.current_history_list_offset = 2;
+  params_B.commit_params.pending_history_list_offset = 0;
+  params.commit_params.page_id = 1;
+  params.commit_params.page_state = state_A;
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params);
   ProcessPendingMessages();
 
   // Now ensure that the UpdateState message we receive is consistent
   // and represents page C in both page_id and state.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID);
   ASSERT_TRUE(msg);
   ViewHostMsg_UpdateState::Read(msg, &param);
   int page_id = param.a;
@@ skipping 27 matching lines @@
   ASSERT_TRUE(msg_A);
   ViewHostMsg_UpdateState::Param param;
   ViewHostMsg_UpdateState::Read(msg_A, &param);
   int page_id_A = param.a;
   PageState state_A = param.b;
   EXPECT_EQ(1, page_id_A);
   render_thread_->sink().ClearMessages();
 
   // Back to page A (page_id 1) and commit.
   FrameMsg_Navigate_Params params_A;
-  params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_A.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_A.current_history_list_length = 2;
-  params_A.current_history_list_offset = 1;
-  params_A.pending_history_list_offset = 0;
-  params_A.page_id = 1;
-  params_A.page_state = state_A;
-  params_A.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_A.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_A.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_A.commit_params.current_history_list_length = 2;
+  params_A.commit_params.current_history_list_offset = 1;
+  params_A.commit_params.pending_history_list_offset = 0;
+  params_A.commit_params.page_id = 1;
+  params_A.commit_params.page_state = state_A;
+  params_A.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_A);
   ProcessPendingMessages();
 
   // A new navigation commits, clearing the forward history.
   LoadHTML("<div>Page C</div>");
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(3, view()->history_page_ids_[1]);
 
   // The browser then sends a stale navigation to B, which should be ignored.
   FrameMsg_Navigate_Params params_B;
-  params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_B.current_history_list_length = 2;
-  params_B.current_history_list_offset = 0;
-  params_B.pending_history_list_offset = 1;
-  params_B.page_id = 2;
-  params_B.page_state = state_A;  // Doesn't matter, just has to be present.
-  params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_B.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_B.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_B.commit_params.current_history_list_length = 2;
+  params_B.commit_params.current_history_list_offset = 0;
+  params_B.commit_params.pending_history_list_offset = 1;
+  params_B.commit_params.page_id = 2;
+  params_B.commit_params.page_state =
+      state_A;  // Doesn't matter, just has to be present.
+  params_B.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_B);
 
   // State should be unchanged.
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(3, view()->history_page_ids_[1]);
 }
 
 // Test that we do not ignore navigations after the entry limit is reached,
 // in which case the browser starts dropping entries from the front.  In this
@@ skipping 40 matching lines @@
   ViewHostMsg_UpdateState::Read(msg_B, &param);
   int page_id_B = param.a;
   PageState state_B = param.b;
   EXPECT_EQ(2, page_id_B);
   render_thread_->sink().ClearMessages();
 
   // Suppose the browser has limited the number of NavigationEntries to 2.
   // It has now dropped the first entry, but the renderer isn't notified.
   // Ensure that going back to page B (page_id 2) at offset 0 is successful.
   FrameMsg_Navigate_Params params_B;
-  params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
-  params_B.current_history_list_length = 2;
-  params_B.current_history_list_offset = 1;
-  params_B.pending_history_list_offset = 0;
-  params_B.page_id = 2;
-  params_B.page_state = state_B;
-  params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params_B.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params_B.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
+  params_B.commit_params.current_history_list_length = 2;
+  params_B.commit_params.current_history_list_offset = 1;
+  params_B.commit_params.pending_history_list_offset = 0;
+  params_B.commit_params.page_id = 2;
+  params_B.commit_params.page_state = state_B;
+  params_B.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params_B);
   ProcessPendingMessages();
 
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(0, view()->history_list_offset_);
   EXPECT_EQ(2, view()->history_page_ids_[0]);
 }
 
 // Test that our IME backend sends a notification message when the input focus
 // changes.
@@ skipping 684 matching lines @@
   GetMainFrame()->enableViewSourceMode(true);
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_FILE_NOT_FOUND;
   error.unreachableURL = GURL("http://foo");
   WebLocalFrame* web_frame = GetMainFrame();
 
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
-  params.page_id = -1;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.url = GURL("data:text/html,test data");
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.commit_params.page_id = -1;
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.core_params.url = GURL("data:text/html,test data");
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
   // Frame should exit view-source mode.
   EXPECT_FALSE(web_frame->isViewSourceModeEnabled());
 }
 
 TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) {
   GetMainFrame()->enableViewSourceMode(true);
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_ABORTED;
   error.unreachableURL = GURL("http://foo");
   WebLocalFrame* web_frame = GetMainFrame();
 
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
-  params.page_id = -1;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.url = GURL("data:text/html,test data");
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.commit_params.page_id = -1;
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.core_params.url = GURL("data:text/html,test data");
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params);
 
   // A cancellation occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
   // Frame should stay in view-source mode.
   EXPECT_TRUE(web_frame->isViewSourceModeEnabled());
 }
 
 // Regression test for http://crbug.com/41562
 TEST_F(RenderViewImplTest, UpdateTargetURLWithInvalidURL) {
@@ skipping 358 matching lines @@
   view()->OnImeConfirmComposition(
       empty_string, gfx::Range::InvalidRange(), false);
 }
 #endif
 
 TEST_F(RenderViewImplTest, ZoomLimit) {
   const double kMinZoomLevel = ZoomFactorToZoomLevel(kMinimumZoomFactor);
   const double kMaxZoomLevel = ZoomFactorToZoomLevel(kMaximumZoomFactor);
 
   FrameMsg_Navigate_Params params;
-  params.page_id = -1;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.commit_params.page_id = -1;
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
 
   // Verifies navigation to a URL with preset zoom level indeed sets the level.
   // Regression test for http://crbug.com/139559, where the level was not
   // properly set when it is out of the default zoom limits of WebView.
-  params.url = GURL("data:text/html,min_zoomlimit_test");
-  view()->OnSetZoomLevelForLoadingURL(params.url, kMinZoomLevel);
+  params.core_params.url = GURL("data:text/html,min_zoomlimit_test");
+  view()->OnSetZoomLevelForLoadingURL(params.core_params.url, kMinZoomLevel);
   frame()->OnNavigate(params);
   ProcessPendingMessages();
   EXPECT_DOUBLE_EQ(kMinZoomLevel, view()->GetWebView()->zoomLevel());
 
   // It should work even when the zoom limit is temporarily changed in the page.
   view()->GetWebView()->zoomLimitsChanged(ZoomFactorToZoomLevel(1.0),
                                           ZoomFactorToZoomLevel(1.0));
-  params.url = GURL("data:text/html,max_zoomlimit_test");
-  view()->OnSetZoomLevelForLoadingURL(params.url, kMaxZoomLevel);
+  params.core_params.url = GURL("data:text/html,max_zoomlimit_test");
+  view()->OnSetZoomLevelForLoadingURL(params.core_params.url, kMaxZoomLevel);
   frame()->OnNavigate(params);
   ProcessPendingMessages();
   EXPECT_DOUBLE_EQ(kMaxZoomLevel, view()->GetWebView()->zoomLevel());
 }
 
 TEST_F(RenderViewImplTest, SetEditableSelectionAndComposition) {
   // Load an HTML page consisting of an input field.
   LoadHTML("<html>"
            "<head>"
            "</head>"
@@ skipping 41 matching lines @@
   EXPECT_EQ(2, info.selectionEnd);
 }
 
 // Test that the navigating specific frames works correctly.
 TEST_F(RenderViewImplTest, NavigateFrame) {
   // Load page A.
   LoadHTML("hello <iframe srcdoc='fail' name='frame'></iframe>");
 
   // Navigate the frame only.
   FrameMsg_Navigate_Params nav_params;
-  nav_params.url = GURL("data:text/html,world");
-  nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  nav_params.transition = PAGE_TRANSITION_TYPED;
-  nav_params.current_history_list_length = 1;
-  nav_params.current_history_list_offset = 0;
-  nav_params.pending_history_list_offset = 1;
-  nav_params.page_id = -1;
+  nav_params.core_params.url = GURL("data:text/html,world");
+  nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  nav_params.core_params.transition = PAGE_TRANSITION_TYPED;
+  nav_params.commit_params.current_history_list_length = 1;
+  nav_params.commit_params.current_history_list_offset = 0;
+  nav_params.commit_params.pending_history_list_offset = 1;
+  nav_params.commit_params.page_id = -1;
   nav_params.frame_to_navigate = "frame";
-  nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  nav_params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(nav_params);
   FrameLoadWaiter(
       RenderFrame::FromWebFrame(frame()->GetWebFrame()->firstChild())).Wait();
 
   // Copy the document content to std::wstring and compare with the
   // expected result.
   const int kMaxOutputCharacters = 256;
   std::string output = base::UTF16ToUTF8(
       GetMainFrame()->contentAsText(kMaxOutputCharacters));
   EXPECT_EQ(output, "hello \n\nworld");
@@ skipping 96 matching lines @@
 TEST_F(SuppressErrorPageTest, MAYBE_Suppresses) {
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_FILE_NOT_FOUND;
   error.unreachableURL = GURL("http://example.com/suppress");
   WebLocalFrame* web_frame = GetMainFrame();
 
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
-  params.page_id = -1;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.url = GURL("data:text/html,test data");
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.commit_params.page_id = -1;
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.core_params.url = GURL("data:text/html,test data");
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("",
             base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_DoesNotSuppress DISABLED_DoesNotSuppress
 #else
 #define MAYBE_DoesNotSuppress DoesNotSuppress
 #endif
 
 TEST_F(SuppressErrorPageTest, MAYBE_DoesNotSuppress) {
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_FILE_NOT_FOUND;
   error.unreachableURL = GURL("http://example.com/dont-suppress");
   WebLocalFrame* web_frame = GetMainFrame();
 
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
-  params.page_id = -1;
-  params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  params.url = GURL("data:text/html,test data");
-  params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+  params.commit_params.page_id = -1;
+  params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  params.core_params.url = GURL("data:text/html,test data");
+  params.commit_params.browser_navigation_start =
+      base::TimeTicks::FromInternalValue(1);
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error);
   // The error page itself is loaded asynchronously.
   FrameLoadWaiter(frame()).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
             base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
 }
@@ skipping 190 matching lines @@
 
 // Sanity checks for the Navigation Timing API |navigationStart| override. We
 // are asserting only most basic constraints, as TimeTicks (passed as the
 // override) are not comparable with the wall time (returned by the Blink API).
 TEST_F(RenderViewImplTest, NavigationStartOverride) {
   // Verify that a navigation that claims to have started at the earliest
   // possible TimeTicks is indeed reported as one that started before
   // OnNavigate() is called.
   base::Time before_navigation = base::Time::Now();
   FrameMsg_Navigate_Params early_nav_params;
-  early_nav_params.url = GURL("data:text/html,<div>Page</div>");
-  early_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  early_nav_params.transition = PAGE_TRANSITION_TYPED;
-  early_nav_params.page_id = -1;
-  early_nav_params.is_post = true;
-  early_nav_params.browser_navigation_start =
+  early_nav_params.core_params.url = GURL("data:text/html,<div>Page</div>");
+  early_nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  early_nav_params.core_params.transition = PAGE_TRANSITION_TYPED;
+  early_nav_params.commit_params.page_id = -1;
+  early_nav_params.request_params.is_post = true;
+  early_nav_params.commit_params.browser_navigation_start =
       base::TimeTicks::FromInternalValue(1);
 
   frame()->OnNavigate(early_nav_params);
   ProcessPendingMessages();
 
   base::Time early_nav_reported_start =
       base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
   EXPECT_LT(early_nav_reported_start, before_navigation);
 
   // Verify that a navigation that claims to have started in the future - 42
   // days from now is *not* reported as one that starts in the future; as we
   // sanitize the override allowing a maximum of ::Now().
   FrameMsg_Navigate_Params late_nav_params;
-  late_nav_params.url = GURL("data:text/html,<div>Another page</div>");
-  late_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  late_nav_params.transition = PAGE_TRANSITION_TYPED;
-  late_nav_params.page_id = -1;
-  late_nav_params.is_post = true;
-  late_nav_params.browser_navigation_start =
+  late_nav_params.core_params.url =
+      GURL("data:text/html,<div>Another page</div>");
+  late_nav_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  late_nav_params.core_params.transition = PAGE_TRANSITION_TYPED;
+  late_nav_params.commit_params.page_id = -1;
+  late_nav_params.request_params.is_post = true;
+  late_nav_params.commit_params.browser_navigation_start =
       base::TimeTicks::Now() + base::TimeDelta::FromDays(42);
 
   frame()->OnNavigate(late_nav_params);
   ProcessPendingMessages();
   base::Time after_navigation =
       base::Time::Now() + base::TimeDelta::FromDays(1);
 
   base::Time late_nav_reported_start =
       base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
   EXPECT_LE(late_nav_reported_start, after_navigation);
 }
 
 }  // namespace content