NavigationController: Reload methods migration

content/browser/frame_host/navigation_controller_impl.cc

Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 2d90ebb2f9db861d3fd425e46ce60d45039c25a8..55523b85b3a5af0c86d5d3f80f1946b65050baae 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -264,21 +264,8 @@ void NavigationControllerImpl::Restore(
   FinishRestore(selected_navigation, type);
 }
 
-void NavigationControllerImpl::Reload(bool check_for_repost) {
-  Reload(check_for_repost, ReloadType::NORMAL);
-}
-void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) {
-  Reload(check_for_repost, ReloadType::BYPASSING_CACHE);
-}
-void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) {
-  Reload(check_for_repost, ReloadType::ORIGINAL_REQUEST_URL);
-}
-void NavigationControllerImpl::ReloadDisableLoFi(bool check_for_repost) {
-  Reload(check_for_repost, ReloadType::DISABLE_LOFI_MODE);
-}
-
-void NavigationControllerImpl::Reload(bool check_for_repost,
-                                      ReloadType reload_type) {
+void NavigationControllerImpl::Reload(ReloadType reload_type,
+                                      bool check_for_repost) {
   if (transient_entry_index_ != -1) {
     // If an interstitial is showing, treat a reload as a navigation to the
     // transient entry's URL.
@@ -402,7 +389,7 @@ void NavigationControllerImpl::ContinuePendingReload() {
   if (pending_reload_ == ReloadType::NONE) {
     NOTREACHED();
   } else {
-    Reload(false, pending_reload_);
+    Reload(pending_reload_, false);

[Takashi Toyoshima, 2016/12/15 06:21:52]

IIRC, in this code path, we already handled prompting before adding the request
to the pending queue? So this is correct.

     pending_reload_ = ReloadType::NONE;
   }
 }