Remove the FrameMsg_Navigate_Params

content/renderer/accessibility/renderer_accessibility_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/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/accessibility/renderer_accessibility.h"
@@ skipping 171 matching lines @@
                                           content::FrameReplicationState());
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_FALSE(sink_->GetUniqueMessageMatching(
       AccessibilityHostMsg_Events::ID));
 
   // Navigate, so we're not swapped out anymore. Now we should
   // send accessibility events again. Note that the
   // message that was queued up before will be quickly discarded
   // because the element it was referring to no longer exists,
   // so the event here is from loading this new page.
-  FrameMsg_Navigate_Params nav_params;
-  nav_params.common_params.url = GURL("data:text/html,<p>Hello, again.</p>");
-  nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
-  nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
-  nav_params.history_params.current_history_list_length = 1;
-  nav_params.history_params.current_history_list_offset = 0;
-  nav_params.history_params.pending_history_list_offset = 1;
-  nav_params.history_params.page_id = -1;
-  nav_params.commit_params.browser_navigation_start =
-      base::TimeTicks::FromInternalValue(1);
-  frame()->OnNavigate(nav_params);
+  CommonNavigationParams common_params;
+  HistoryNavigationParams history_params;
+  common_params.url = GURL("data:text/html,<p>Hello, again.</p>");
+  common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+  common_params.transition = ui::PAGE_TRANSITION_TYPED;
+  history_params.current_history_list_length = 1;
+  history_params.current_history_list_offset = 0;
+  history_params.pending_history_list_offset = 1;
+  history_params.page_id = -1;
+  frame()->OnNavigate(common_params, StartNavigationParams(),
+                      CommitNavigationParams(), history_params);
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_TRUE(sink_->GetUniqueMessageMatching(
       AccessibilityHostMsg_Events::ID));
 }
 
 TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
   // Test RendererAccessibility and make sure it sends the
   // proper event to the browser when an object in the tree
   // is hidden, but its children are not.
   std::string html =
@@ skipping 191 matching lines @@
 
   const IPC::Message* message =
       sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID);
   ASSERT_TRUE(message);
   Tuple<std::vector<AccessibilityHostMsg_EventParams>, int> param;
   AccessibilityHostMsg_Events::Read(message, &param);
   ASSERT_EQ(0U, get<0>(param).size());
 }
 
 }  // namespace content