Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_frame_impl_browsertest.cc

Index: content/renderer/render_frame_impl_browsertest.cc
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc
index dd92b7bb0b732ba92b2e9c7be9c271c239a54aa6..2e028af8de5d3a8857be6d5fb429dedc264de690 100644
--- a/content/renderer/render_frame_impl_browsertest.cc
+++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -191,11 +191,13 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
 
   // The main frame's and subframe's LoFi states should stay the same on
   // navigations within the page.
-  frame()->didNavigateWithinPage(frame()->GetWebFrame(), item,
+  frame()->didNavigateWithinPage(frame()->GetWebFrame()->dataSource(),
+                                 blink::WebFrameLoadType::Standard, item,
                                  blink::WebStandardCommit, true);
   EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
   GetMainRenderFrame()->didNavigateWithinPage(
-      GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit,
+      GetMainRenderFrame()->GetWebFrame()->dataSource(),
+      blink::WebFrameLoadType::Standard, item, blink::WebStandardCommit,
       true);
   EXPECT_EQ(SERVER_LOFI_ON, GetMainRenderFrame()->GetPreviewsState());
 
@@ -205,7 +207,8 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
   static_cast<NavigationStateImpl*>(document_state->navigation_state())
       ->set_was_within_same_page(false);
 
-  frame()->didCommitProvisionalLoad(frame()->GetWebFrame(), item,
+  frame()->didCommitProvisionalLoad(frame()->GetWebFrame()->dataSource(),
+                                    blink::WebFrameLoadType::Standard, item,
                                     blink::WebStandardCommit);
   EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
 
@@ -218,7 +221,8 @@ TEST_F(RenderFrameImplTest, LoFiNotUpdatedOnSubframeCommits) {
   // Calling didCommitProvisionalLoad is not representative of a full navigation
   // but serves the purpose of testing the LoFi state logic.
   GetMainRenderFrame()->didCommitProvisionalLoad(
-      GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit);
+      GetMainRenderFrame()->GetWebFrame()->dataSource(),
+      blink::WebFrameLoadType::Standard, item, blink::WebStandardCommit);
   EXPECT_EQ(PREVIEWS_OFF, GetMainRenderFrame()->GetPreviewsState());
   // The subframe would be deleted here after a cross-document navigation. It
   // happens to be left around in this test because this does not simulate the
@@ -252,11 +256,13 @@ TEST_F(RenderFrameImplTest, EffectiveConnectionType) {
 
     // The main frame's and subframe's effective connection type should stay the
     // same on navigations within the page.
-    frame()->didNavigateWithinPage(frame()->GetWebFrame(), item,
+    frame()->didNavigateWithinPage(frame()->GetWebFrame()->dataSource(),
+                                   blink::WebFrameLoadType::Standard, item,
                                    blink::WebStandardCommit, true);
     EXPECT_EQ(tests[i].type, frame()->getEffectiveConnectionType());
     GetMainRenderFrame()->didNavigateWithinPage(
-        GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit,
+        GetMainRenderFrame()->GetWebFrame()->dataSource(),
+        blink::WebFrameLoadType::Standard, item, blink::WebStandardCommit,
         true);
     EXPECT_EQ(tests[i].type, frame()->getEffectiveConnectionType());
 
@@ -266,7 +272,8 @@ TEST_F(RenderFrameImplTest, EffectiveConnectionType) {
     static_cast<NavigationStateImpl*>(document_state->navigation_state())
         ->set_was_within_same_page(false);
 
-    frame()->didCommitProvisionalLoad(frame()->GetWebFrame(), item,
+    frame()->didCommitProvisionalLoad(frame()->GetWebFrame()->dataSource(),
+                                      blink::WebFrameLoadType::Standard, item,
                                       blink::WebStandardCommit);
     EXPECT_EQ(tests[i].type, frame()->getEffectiveConnectionType());
 
@@ -277,7 +284,8 @@ TEST_F(RenderFrameImplTest, EffectiveConnectionType) {
         ->set_was_within_same_page(false);
 
     GetMainRenderFrame()->didCommitProvisionalLoad(
-        GetMainRenderFrame()->GetWebFrame(), item, blink::WebStandardCommit);
+        GetMainRenderFrame()->GetWebFrame()->dataSource(),
+        blink::WebFrameLoadType::Standard, item, blink::WebStandardCommit);
     EXPECT_EQ(blink::WebEffectiveConnectionType::TypeUnknown,
               GetMainRenderFrame()->getEffectiveConnectionType());