Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_frame_impl_browsertest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "build/build_config.h"
 #include "content/child/web_url_loader_impl.h"
@@ skipping 173 matching lines @@
   SetPreviewsState(GetMainRenderFrame(), SERVER_LOFI_ON);
   SetPreviewsState(frame(), SERVER_LOFI_ON);
   EXPECT_EQ(SERVER_LOFI_ON, GetMainRenderFrame()->GetPreviewsState());
   EXPECT_EQ(SERVER_LOFI_ON, frame()->GetPreviewsState());
 
   blink::WebHistoryItem item;
   item.initialize();
 
   // 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());
 
   // The subframe's LoFi state should not be reset on commit.
   DocumentState* document_state =
       DocumentState::FromDataSource(frame()->GetWebFrame()->dataSource());
   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());
 
   // The main frame's LoFi state should be reset to off on commit.
   document_state = DocumentState::FromDataSource(
       GetMainRenderFrame()->GetWebFrame()->dataSource());
   static_cast<NavigationStateImpl*>(document_state->navigation_state())
       ->set_was_within_same_page(false);
 
   // 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
   // frame detach.
 }
 
 // Test that effective connection type only updates for new main frame
 // documents.
 TEST_F(RenderFrameImplTest, EffectiveConnectionType) {
   EXPECT_EQ(blink::WebEffectiveConnectionType::TypeUnknown,
@@ skipping 13 matching lines @@
 
     EXPECT_EQ(tests[i].type, frame()->getEffectiveConnectionType());
     EXPECT_EQ(tests[i].type,
               GetMainRenderFrame()->getEffectiveConnectionType());
 
     blink::WebHistoryItem item;
     item.initialize();
 
     // 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());
 
     // The subframe's effective connection type should not be reset on commit.
     DocumentState* document_state =
         DocumentState::FromDataSource(frame()->GetWebFrame()->dataSource());
     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());
 
     // The main frame's effective connection type should be reset on commit.
     document_state = DocumentState::FromDataSource(
         GetMainRenderFrame()->GetWebFrame()->dataSource());
     static_cast<NavigationStateImpl*>(document_state->navigation_state())
         ->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());
 
     // 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 frame detach.
   }
 }
 
 TEST_F(RenderFrameImplTest, SaveImageFromDataURL) {
@@ skipping 64 matching lines @@
   common_params.url = GURL("data:text/html,max_zoomlimit_test");
   GetMainRenderFrame()->SetHostZoomLevel(common_params.url, kMaxZoomLevel);
   GetMainRenderFrame()->NavigateInternal(
       common_params, StartNavigationParams(), RequestNavigationParams(),
       std::unique_ptr<StreamOverrideParameters>());
   ProcessPendingMessages();
   EXPECT_DOUBLE_EQ(kMaxZoomLevel, view_->GetWebView()->zoomLevel());
 }
 
 }  // namespace