Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1883)

Unified Diff: content/browser/frame_host/navigation_controller_impl_browsertest.cc

Issue 2544283002: NavigationController: remove ReloadToRefreshContent (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index 64fe1da373172c0f6badd4a1dc316cc26c3483ba..f079f7d1727362c8fcfa61d6a87b4aecea97c042 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -6690,9 +6690,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
shell()->web_contents()->GetController());
- // ReloadToRefreshContent triggers a reload of ReloadType::MAIN_RESOURCE. The
- // first reload should not be counted.
- controller.ReloadToRefreshContent(false);
+ // Reload triggers a reload of ReloadType::MAIN_RESOURCE. The first reload
+ // should not be counted.
+ controller.Reload(false);
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
histogram.ExpectTotalCount(kReloadToReloadMetricName, 0);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 0);
@@ -6721,14 +6721,14 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// Then, the next reload should be assumed as the first reload. Metrics
// should not be changed for the first reload.
- controller.ReloadToRefreshContent(false);
+ controller.Reload(false);
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
histogram.ExpectTotalCount(kReloadToReloadMetricName, 2);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 1);
// Another reload of ReloadType::MAIN_RESOURCE should be counted by both
// metrics again.
- controller.ReloadToRefreshContent(false);
+ controller.Reload(false);
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
histogram.ExpectTotalCount(kReloadToReloadMetricName, 3);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 2);
@@ -6745,7 +6745,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
histogram.ExpectTotalCount(kReloadToReloadMetricName, 3);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 2);
- controller.ReloadToRefreshContent(false);
+ controller.Reload(false);
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
@@ -6756,7 +6756,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
- controller.ReloadToRefreshContent(false);
+ controller.Reload(false);
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);

Powered by Google App Engine
This is Rietveld 408576698