Inject CanAddURLToHistory into TopSitesImpl

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 205 matching lines @@
     ui::KeyEvent event1(xevent);
     NativeWebKeyboardEvent keydown_event(event1);
     SendNativeKeyEvent(keydown_event);
 
     // X11 doesn't actually have native character events, but give the test
     // what it wants.
     xevent.InitKeyEvent(ui::ET_KEY_PRESSED,
                         static_cast<ui::KeyboardCode>(key_code),
                         flags);
     ui::KeyEvent event2(xevent);
-    event2.set_character(
-        DomCodeToUsLayoutCharacter(event2.code(), event2.flags()));
+    event2.set_character(GetCharacterFromKeyCode(event2.key_code(),
+                                                 event2.flags()));
     ui::KeyEventTestApi test_event2(&event2);
     test_event2.set_is_char(true);
     NativeWebKeyboardEvent char_event(event2);
     SendNativeKeyEvent(char_event);
 
     xevent.InitKeyEvent(ui::ET_KEY_RELEASED,
                         static_cast<ui::KeyboardCode>(key_code),
                         flags);
     ui::KeyEvent event3(xevent);
     NativeWebKeyboardEvent keyup_event(event3);
     SendNativeKeyEvent(keyup_event);
 
-    long c = DomCodeToUsLayoutCharacter(
-        UsLayoutKeyboardCodeToDomCode(static_cast<ui::KeyboardCode>(key_code)),
-        flags);
+    long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
+                                     flags);
     output->assign(1, static_cast<base::char16>(c));
     return 1;
 #elif defined(USE_OZONE)
     const int flags = ConvertMockKeyboardModifier(modifiers);
 
     ui::KeyEvent keydown_event(ui::ET_KEY_PRESSED,
                                static_cast<ui::KeyboardCode>(key_code),
                                flags);
     NativeWebKeyboardEvent keydown_web_event(keydown_event);
     SendNativeKeyEvent(keydown_web_event);
 
     ui::KeyEvent char_event(keydown_event.GetCharacter(),
                             static_cast<ui::KeyboardCode>(key_code),
                             flags);
     NativeWebKeyboardEvent char_web_event(char_event);
     SendNativeKeyEvent(char_web_event);
 
     ui::KeyEvent keyup_event(ui::ET_KEY_RELEASED,
                              static_cast<ui::KeyboardCode>(key_code),
                              flags);
     NativeWebKeyboardEvent keyup_web_event(keyup_event);
     SendNativeKeyEvent(keyup_web_event);
 
-    long c = DomCodeToUsLayoutCharacter(
-        UsLayoutKeyboardCodeToDomCode(static_cast<ui::KeyboardCode>(key_code)),
-        flags);
+    long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
+                                     flags);
     output->assign(1, static_cast<base::char16>(c));
     return 1;
 #else
     NOTIMPLEMENTED();
     return L'\0';
 #endif
   }
 
   void EnablePreferredSizeMode() {
     view()->OnEnablePreferredSizeChangedMode();
   }
 
   const gfx::Size& GetPreferredSize() {
     view()->CheckPreferredSize();
     return view()->preferred_size_;
   }
 
   void SetZoomLevel(double level) {
     view()->OnSetZoomLevelForView(false, level);
   }
 
-  void NavigateFrame(const CommonNavigationParams& common_params,
+  void NavigateMainFrame(const CommonNavigationParams& common_params,
+                         const StartNavigationParams& start_params,
+                         const RequestNavigationParams& request_params) {
+    NavigateFrame(frame(), common_params, start_params, request_params);
+  }
+
+  void NavigateFrame(RenderFrameImpl* frame,
+                     const CommonNavigationParams& common_params,
                      const StartNavigationParams& start_params,
                      const RequestNavigationParams& request_params) {
     // PlzNavigate
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableBrowserSideNavigation)) {
-      frame()->OnCommitNavigation(ResourceResponseHead(), common_params.url,
-                                  common_params, request_params);
+      frame->OnCommitNavigation(ResourceResponseHead(), common_params.url,
+                                common_params, request_params);
       return;
     }
-    frame()->OnNavigate(common_params, start_params, request_params);
+    frame->OnNavigate(common_params, start_params, request_params);
   }
 
   void SwapOut(RenderFrameImpl* frame,
                int proxy_routing_id,
                bool is_loading,
                const FrameReplicationState& replicated_frame_state) {
     frame->OnSwapOut(proxy_routing_id, is_loading, replicated_frame_state);
   }
 
   void SetEditableSelectionOffsets(int start, int end) {
@@ skipping 157 matching lines @@
   request_params.page_id = -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);
   start_params.is_post = true;
   start_params.browser_initiated_post_data = post_data;
 
-  NavigateFrame(common_params, start_params, request_params);
+  NavigateMainFrame(common_params, start_params, request_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;
   FrameHostMsg_DidCommitProvisionalLoad::Read(frame_navigate_msg,
                                               &host_nav_params);
@@ skipping 178 matching lines @@
   // update for the swapped out URL.  (http://crbug.com/72235)
   CommonNavigationParams common_params;
   RequestNavigationParams request_params;
   common_params.url = GURL("data:text/html,<div>Page B</div>");
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.transition = ui::PAGE_TRANSITION_TYPED;
   request_params.current_history_list_length = 1;
   request_params.current_history_list_offset = 0;
   request_params.pending_history_list_offset = 1;
   request_params.page_id = -1;
-  NavigateFrame(common_params, StartNavigationParams(), request_params);
+  NavigateMainFrame(common_params, StartNavigationParams(), request_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) {
   // Load page A.
@@ skipping 17 matching lines @@
   // Back to page A (page_id 1) and commit.
   CommonNavigationParams common_params_A;
   RequestNavigationParams request_params_A;
   common_params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_A.current_history_list_length = 2;
   request_params_A.current_history_list_offset = 1;
   request_params_A.pending_history_list_offset = 0;
   request_params_A.page_id = 1;
   request_params_A.page_state = state_A;
-  NavigateFrame(common_params_A, StartNavigationParams(), request_params_A);
+  NavigateMainFrame(common_params_A, StartNavigationParams(), request_params_A);
   EXPECT_EQ(1, view()->historyBackListCount());
   EXPECT_EQ(2, view()->historyBackListCount() +
       view()->historyForwardListCount() + 1);
   ProcessPendingMessages();
 
   // Respond to a swap out request.
   SwapOut(frame(), kProxyRoutingId, true, content::FrameReplicationState());
 
   // 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://.
   CommonNavigationParams common_params;
   RequestNavigationParams request_params;
   common_params.url = GURL("data:text/html,<div>Page A</div>");
   common_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
   common_params.transition = ui::PAGE_TRANSITION_RELOAD;
   request_params.current_history_list_length = 2;
   request_params.current_history_list_offset = 0;
   request_params.pending_history_list_offset = 0;
   request_params.page_id = 1;
   request_params.page_state = state_A;
-  NavigateFrame(common_params, StartNavigationParams(), request_params);
+  NavigateMainFrame(common_params, StartNavigationParams(), request_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.
   FrameHostMsg_DidCommitProvisionalLoad::Param commit_load_params;
@@ skipping 97 matching lines @@
   // Go back to C and commit, preparing for our real test.
   CommonNavigationParams common_params_C;
   RequestNavigationParams request_params_C;
   common_params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_C.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_C.current_history_list_length = 4;
   request_params_C.current_history_list_offset = 3;
   request_params_C.pending_history_list_offset = 2;
   request_params_C.page_id = 3;
   request_params_C.page_state = state_C;
-  NavigateFrame(common_params_C, StartNavigationParams(), request_params_C);
+  NavigateMainFrame(common_params_C, StartNavigationParams(), request_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.
   CommonNavigationParams common_params_B;
   RequestNavigationParams request_params_B;
   common_params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_B.current_history_list_length = 4;
   request_params_B.current_history_list_offset = 2;
   request_params_B.pending_history_list_offset = 1;
   request_params_B.page_id = 2;
   request_params_B.page_state = state_B;
-  NavigateFrame(common_params_B, StartNavigationParams(), request_params_B);
+  NavigateMainFrame(common_params_B, StartNavigationParams(), request_params_B);
 
   // Back to page A (page_id 1) and commit.
   CommonNavigationParams common_params;
   RequestNavigationParams request_params;
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params.current_history_list_length = 4;
   request_params.current_history_list_offset = 2;
   request_params.pending_history_list_offset = 0;
   request_params.page_id = 1;
   request_params.page_state = state_A;
-  NavigateFrame(common_params, StartNavigationParams(), request_params);
+  NavigateMainFrame(common_params, StartNavigationParams(), request_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 = get<0>(param);
   PageState state = get<1>(param);
@@ skipping 31 matching lines @@
   // Back to page A (page_id 1) and commit.
   CommonNavigationParams common_params_A;
   RequestNavigationParams request_params_A;
   common_params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_A.current_history_list_length = 2;
   request_params_A.current_history_list_offset = 1;
   request_params_A.pending_history_list_offset = 0;
   request_params_A.page_id = 1;
   request_params_A.page_state = state_A;
-  NavigateFrame(common_params_A, StartNavigationParams(), request_params_A);
+  NavigateMainFrame(common_params_A, StartNavigationParams(), request_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()->page_id_); // page C is now page id 3
 
   // The browser then sends a stale navigation to B, which should be ignored.
   CommonNavigationParams common_params_B;
   RequestNavigationParams request_params_B;
   common_params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_B.current_history_list_length = 2;
   request_params_B.current_history_list_offset = 0;
   request_params_B.pending_history_list_offset = 1;
   request_params_B.page_id = 2;
   request_params_B.page_state =
       state_A;  // Doesn't matter, just has to be present.
-  NavigateFrame(common_params_B, StartNavigationParams(), request_params_B);
+  NavigateMainFrame(common_params_B, StartNavigationParams(), request_params_B);
 
   // State should be unchanged.
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(3, view()->page_id_); // page C, not page B
 
   // Check for a valid DidDropNavigation message.
   ProcessPendingMessages();
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_DidDropNavigation::ID);
@@ skipping 694 matching lines @@
   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.
   CommonNavigationParams common_params;
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(
       web_frame, error, blink::WebStandardCommit);
   // 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.
   CommonNavigationParams common_params;
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
 
   // A cancellation occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(
       web_frame, error, blink::WebStandardCommit);
   // Frame should stay in view-source mode.
   EXPECT_TRUE(web_frame->isViewSourceModeEnabled());
 }
 
 // Regression test for http://crbug.com/41562
 TEST_F(RenderViewImplTest, UpdateTargetURLWithInvalidURL) {
@@ skipping 176 matching lines @@
 TEST_F(RenderViewImplTest, ZoomLimit) {
   const double kMinZoomLevel = ZoomFactorToZoomLevel(kMinimumZoomFactor);
   const double kMaxZoomLevel = ZoomFactorToZoomLevel(kMaximumZoomFactor);
 
   // 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.
   CommonNavigationParams common_params;
   common_params.url = GURL("data:text/html,min_zoomlimit_test");
   view()->OnSetZoomLevelForLoadingURL(common_params.url, kMinZoomLevel);
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
   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));
   common_params.url = GURL("data:text/html,max_zoomlimit_test");
   view()->OnSetZoomLevelForLoadingURL(common_params.url, kMaxZoomLevel);
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
   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>"
            "<body>"
@@ skipping 34 matching lines @@
   EXPECT_EQ(7, info.selectionEnd);
   SetEditableSelectionOffsets(4, 8);
   ExtendSelectionAndDelete(2, 5);
   info = view()->webview()->textInputInfo();
   EXPECT_EQ("abuvwxyz", info.value);
   EXPECT_EQ(2, info.selectionStart);
   EXPECT_EQ(2, info.selectionEnd);
 }
 
 // Test that the navigating specific frames works correctly.
-TEST_F(RenderViewImplTest, NavigateFrame) {
+TEST_F(RenderViewImplTest, NavigateSubframe) {
   // Load page A.
   LoadHTML("hello <iframe srcdoc='fail' name='frame'></iframe>");
 
   // Navigate the frame only.
   CommonNavigationParams common_params;
   RequestNavigationParams request_params;
   common_params.url = GURL("data:text/html,world");
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.transition = ui::PAGE_TRANSITION_TYPED;
   request_params.current_history_list_length = 1;
   request_params.current_history_list_offset = 0;
   request_params.pending_history_list_offset = 1;
   request_params.page_id = -1;
-  request_params.frame_to_navigate = "frame";
   request_params.browser_navigation_start =
       base::TimeTicks::FromInternalValue(1);
-  NavigateFrame(common_params, StartNavigationParams(), request_params);
-  FrameLoadWaiter(
-      RenderFrame::FromWebFrame(frame()->GetWebFrame()->firstChild())).Wait();
+
+  RenderFrameImpl* subframe = RenderFrameImpl::FromWebFrame(
+      view()->webview()->findFrameByName("frame"));
+  NavigateFrame(subframe, common_params, StartNavigationParams(),
+                request_params);
+  FrameLoadWaiter(subframe).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");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
@@ skipping 94 matching lines @@
   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.
   CommonNavigationParams common_params;
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(
       web_frame, error, blink::WebStandardCommit);
   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.
   CommonNavigationParams common_params;
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
-  NavigateFrame(common_params, StartNavigationParams(),
-                RequestNavigationParams());
+  NavigateMainFrame(common_params, StartNavigationParams(),
+                    RequestNavigationParams());
 
   // An error occurred.
   view()->GetMainRenderFrame()->didFailProvisionalLoad(
       web_frame, error, blink::WebStandardCommit);
   // 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 189 matching lines @@
   CommonNavigationParams early_common_params;
   StartNavigationParams early_start_params;
   RequestNavigationParams early_request_params;
   early_common_params.url = GURL("data:text/html,<div>Page</div>");
   early_common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   early_common_params.transition = ui::PAGE_TRANSITION_TYPED;
   early_start_params.is_post = true;
   early_request_params.browser_navigation_start =
       base::TimeTicks::FromInternalValue(1);
 
-  NavigateFrame(early_common_params, early_start_params, early_request_params);
+  NavigateMainFrame(early_common_params, early_start_params,
+                    early_request_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().
   CommonNavigationParams late_common_params;
   RequestNavigationParams late_request_params;
   StartNavigationParams late_start_params;
   late_common_params.url = GURL("data:text/html,<div>Another page</div>");
   late_common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   late_common_params.transition = ui::PAGE_TRANSITION_TYPED;
   late_start_params.is_post = true;
   late_request_params.browser_navigation_start =
       base::TimeTicks::Now() + base::TimeDelta::FromDays(42);
 
-  NavigateFrame(late_common_params, late_start_params, late_request_params);
+  NavigateMainFrame(late_common_params, late_start_params, late_request_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);
 }
 
 TEST_F(RenderViewImplTest, PreferredSizeZoomed) {
@@ skipping 16 matching lines @@
   EXPECT_EQ(0, view()->historyBackListCount());
   EXPECT_EQ(0, view()->historyBackListCount() +
       view()->historyForwardListCount() + 1);
 
   // Receive a Navigate message with history parameters.
   RequestNavigationParams request_params;
   request_params.current_history_list_length = 2;
   request_params.current_history_list_offset = 1;
   request_params.pending_history_list_offset = 2;
   request_params.page_id = -1;
-  NavigateFrame(CommonNavigationParams(), StartNavigationParams(),
-                request_params);
+  NavigateMainFrame(CommonNavigationParams(), StartNavigationParams(),
+                    request_params);
 
   // The history list in RenderView should have been updated.
   EXPECT_EQ(1, view()->historyBackListCount());
   EXPECT_EQ(2, view()->historyBackListCount() +
       view()->historyForwardListCount() + 1);
 }
 
 TEST_F(DevToolsAgentTest, DevToolsResumeOnClose) {
   Attach();
   EXPECT_FALSE(IsPaused());
   DispatchDevToolsMessage("{\"id\":1,\"method\":\"Debugger.enable\"}");
 
   // Executing javascript will pause the thread and create nested message loop.
   // Posting task simulates message coming from browser.
   base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
       &DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScript("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content