NavigationController: Reload methods migration

content/browser/frame_host/navigation_controller_android.cc

 // Copyright 2013 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 "content/browser/frame_host/navigation_controller_android.h"
 
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 129 matching lines @@
 
 void NavigationControllerAndroid::ContinuePendingReload(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   navigation_controller_->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(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   navigation_controller_->SetNeedsReload();
 }
 
 void NavigationControllerAndroid::CancelPendingReload(
     JNIEnv* env,
@@ skipping 165 matching lines @@
     return;
 
   // Set the flag in the NavigationEntry.
   entry->SetIsOverridingUserAgent(enabled);
   navigation_controller_->delegate()->UpdateOverridingUserAgent();
 
   // Send the override to the renderer.
   if (reload_on_state_change) {
     // Reloading the page will send the override down as part of the
     // navigation IPC message.
-    navigation_controller_->ReloadOriginalRequestURL(false);
+    // TODO(toyoshim): Should this call use |true| for check_for_post argument?
+    navigation_controller_->Reload(ReloadType::ORIGINAL_REQUEST_URL, false);
   }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 NavigationControllerAndroid::GetEntryAtIndex(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj,
                                              int index) {
   if (index < 0 || index >= navigation_controller_->GetEntryCount())
     return base::android::ScopedJavaLocalRef<jobject>();
 
@@ skipping 82 matching lines @@
     const JavaParamRef<jstring>& jvalue) {
   if (index < 0 || index >= navigation_controller_->GetEntryCount())
     return;
 
   std::string key = base::android::ConvertJavaStringToUTF8(env, jkey);
   base::string16 value = base::android::ConvertJavaStringToUTF16(env, jvalue);
   navigation_controller_->GetEntryAtIndex(index)->SetExtraData(key, value);
 }
 
 }  // namespace content