NavigationController: Reload methods migration

content/browser/frame_host/navigation_controller_android.cc

Index: content/browser/frame_host/navigation_controller_android.cc
diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc
index 88643f4840cc31cc8a6cb2408ce0b8b585bbff8d..4f5e4044be84e6e8a5b65ae0cb57a281155c3ce0 100644
--- a/content/browser/frame_host/navigation_controller_android.cc
+++ b/content/browser/frame_host/navigation_controller_android.cc
@@ -147,14 +147,14 @@ void NavigationControllerAndroid::ContinuePendingReload(
 void NavigationControllerAndroid::Reload(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj,
                                          jboolean check_for_repost) {
-  navigation_controller_->Reload(check_for_repost);
+  navigation_controller_->Reload(ReloadType::NORMAL, check_for_repost);
 }
 
 void NavigationControllerAndroid::ReloadBypassingCache(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jboolean check_for_repost) {
-  navigation_controller_->ReloadBypassingCache(check_for_repost);
+  navigation_controller_->Reload(ReloadType::BYPASSING_CACHE, check_for_repost);
 }
 
 void NavigationControllerAndroid::RequestRestoreLoad(
@@ -340,7 +340,7 @@ void NavigationControllerAndroid::SetUseDesktopUserAgent(
   if (reload_on_state_change) {
     // Reloading the page will send the override down as part of the
     // navigation IPC message.
-    navigation_controller_->ReloadOriginalRequestURL(false);
+    navigation_controller_->Reload(ReloadType::ORIGINAL_REQUEST_URL, false);

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

This may be wrong?

This is called when users want to switch viewing PC version page, triggered from
the burger menu. It would be better to show prompting if possible.

I'll left a TODO here and fix this later.

[Charlie Reis, 2016/12/15 18:44:03]

Yes, I think I agree, but we should get an Android reviewer on that when we go
to fix it later.

   }
 }