android: Remove some unused code

Found unused code while looking at code for tab reload after crash.

Change-Id: I2073d7038f46df14a4c2bfbdce2ae3c22f175595
Reviewed-on: https://chromium-review.googlesource.com/c/1316358Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605361}

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -1985,7 +1985,6 @@ public class Tab
      * background on low-memory devices).
      * @return true iff the Tab handled the request.
      */
-    @CalledByNative
     public boolean loadIfNeeded() {
         if (getActivity() == null) {
             Log.e(TAG, "Tab couldn't be loaded because Context was null.");

chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java

@@ -162,11 +162,6 @@ public class NavigationPopupTest {
             return null;
         }
 
-        @Override
-        public String getOriginalUrlForVisibleNavigationEntry() {
-            return null;
-        }
-
         @Override
         public void clearSslPreferences() {
         }
@@ -210,23 +205,6 @@ public class NavigationPopupTest {
             return false;
         }
 
-        @Override
-        public boolean canCopyStateOver() {
-            return false;
-        }
-
-        @Override
-        public boolean canPruneAllButLastCommitted() {
-            return false;
-        }
-
-        @Override
-        public void copyStateFrom(NavigationController source, boolean needsReload) {}
-
-        @Override
-        public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry) {
-        }
-
         @Override
         public String getEntryExtraData(int index, String key) {
             return null;

chrome/android/junit/src/org/chromium/chrome/browser/contextual_suggestions/GoogleSearchRestrictionTest.java

@@ -346,11 +346,6 @@ public class GoogleSearchRestrictionTest {
             return null;
         }
 
-        @Override
-        public String getOriginalUrlForVisibleNavigationEntry() {
-            return null;
-        }
-
         @Override
         public void clearSslPreferences() {}
 
@@ -372,22 +367,6 @@ public class GoogleSearchRestrictionTest {
             return false;
         }
 
-        @Override
-        public boolean canCopyStateOver() {
-            return false;
-        }
-
-        @Override
-        public boolean canPruneAllButLastCommitted() {
-            return false;
-        }
-
-        @Override
-        public void copyStateFrom(NavigationController source, boolean needsReload) {}
-
-        @Override
-        public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry) {}
-
         @Override
         public String getEntryExtraData(int index, String key) {
             return null;

chrome/browser/android/tab_android.cc

@@ -253,11 +253,6 @@ bool TabAndroid::IsUserInteractable() const {
   return Java_Tab_isUserInteractable(env, weak_java_tab_.get(env));
 }
 
-bool TabAndroid::LoadIfNeeded() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  return Java_Tab_loadIfNeeded(env, weak_java_tab_.get(env));
-}
-
 Profile* TabAndroid::GetProfile() const {
   if (!web_contents())
     return NULL;

chrome/browser/android/tab_android.h

@@ -107,9 +107,6 @@ class TabAndroid : public CoreTabHelperDelegate,
   // it.
   bool IsUserInteractable() const;
 
-  // Load the tab if it was unloaded from memory.
-  bool LoadIfNeeded();
-
   // Helper methods to make it easier to access objects from the associated
   // WebContents.  Can return NULL.
   Profile* GetProfile() const;

content/browser/frame_host/navigation_controller_android.cc

@@ -300,16 +300,6 @@ void NavigationControllerAndroid::GetDirectedNavigationHistory(
   }
 }
 
-ScopedJavaLocalRef<jstring>
-NavigationControllerAndroid::GetOriginalUrlForVisibleNavigationEntry(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
-  NavigationEntry* entry = navigation_controller_->GetVisibleEntry();
-  if (entry == NULL)
-    return ScopedJavaLocalRef<jstring>(env, NULL);
-  return ConvertUTF8ToJavaString(env, entry->GetOriginalRequestURL().spec());
-}
-
 void NavigationControllerAndroid::ClearSslPreferences(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
@@ -389,42 +379,6 @@ jboolean NavigationControllerAndroid::RemoveEntryAtIndex(
   return navigation_controller_->RemoveEntryAtIndex(index);
 }
 
-jboolean NavigationControllerAndroid::CanCopyStateOver(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
-  return navigation_controller_->GetEntryCount() == 0 &&
-      !navigation_controller_->GetPendingEntry();
-}
-
-jboolean NavigationControllerAndroid::CanPruneAllButLastCommitted(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
-  return navigation_controller_->CanPruneAllButLastCommitted();
-}
-
-void NavigationControllerAndroid::CopyStateFrom(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    jlong source_navigation_controller_android,
-    jboolean needs_reload) {
-  navigation_controller_->CopyStateFrom(
-      *(reinterpret_cast<NavigationControllerAndroid*>(
-            source_navigation_controller_android)
-            ->navigation_controller_),
-      needs_reload);
-}
-
-void NavigationControllerAndroid::CopyStateFromAndPrune(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    jlong source_navigation_controller_android,
-    jboolean replace_entry) {
-  navigation_controller_->CopyStateFromAndPrune(
-      reinterpret_cast<NavigationControllerAndroid*>(
-          source_navigation_controller_android)->navigation_controller_,
-      replace_entry);
-}
-
 ScopedJavaLocalRef<jstring> NavigationControllerAndroid::GetEntryExtraData(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,

content/browser/frame_host/navigation_controller_android.h

@@ -108,10 +108,6 @@ class CONTENT_EXPORT NavigationControllerAndroid {
       const base::android::JavaParamRef<jobject>& history,
       jboolean is_forward,
       jint max_entries);
-  base::android::ScopedJavaLocalRef<jstring>
-  GetOriginalUrlForVisibleNavigationEntry(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& obj);
   void ClearHistory(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj);
   int GetLastCommittedEntryIndex(
@@ -120,19 +116,6 @@ class CONTENT_EXPORT NavigationControllerAndroid {
   jboolean RemoveEntryAtIndex(JNIEnv* env,
                               const base::android::JavaParamRef<jobject>& obj,
                               jint index);
-  jboolean CanCopyStateOver(JNIEnv* env,
-                            const base::android::JavaParamRef<jobject>& obj);
-  jboolean CanPruneAllButLastCommitted(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& obj);
-  void CopyStateFrom(JNIEnv* env,
-                     const base::android::JavaParamRef<jobject>& obj,
-                     jlong source_native_navigation_controller_android,
-                     jboolean needs_reload);
-  void CopyStateFromAndPrune(JNIEnv* env,
-                             const base::android::JavaParamRef<jobject>& obj,
-                             jlong source_native_navigation_controller_android,
-                             jboolean replace_entry);
   base::android::ScopedJavaLocalRef<jstring> GetEntryExtraData(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,

content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java

@@ -154,7 +154,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
     }
 
     @Override
-    @VisibleForTesting
     public void clearHistory() {
         if (mNativeNavigationControllerAndroid != 0) {
             nativeClearHistory(mNativeNavigationControllerAndroid);
@@ -180,12 +179,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
         return history;
     }
 
-    @Override
-    public String getOriginalUrlForVisibleNavigationEntry() {
-        if (mNativeNavigationControllerAndroid == 0) return null;
-        return nativeGetOriginalUrlForVisibleNavigationEntry(mNativeNavigationControllerAndroid);
-    }
-
     @Override
     public void clearSslPreferences() {
         if (mNativeNavigationControllerAndroid != 0) {
@@ -241,38 +234,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
         return false;
     }
 
-    @Override
-    public boolean canCopyStateOver() {
-        return mNativeNavigationControllerAndroid != 0
-                && nativeCanCopyStateOver(mNativeNavigationControllerAndroid);
-    }
-
-    @Override
-    public boolean canPruneAllButLastCommitted() {
-        return mNativeNavigationControllerAndroid != 0
-                && nativeCanPruneAllButLastCommitted(mNativeNavigationControllerAndroid);
-    }
-
-    @Override
-    public void copyStateFrom(NavigationController source, boolean needsReload) {
-        if (mNativeNavigationControllerAndroid == 0) return;
-        NavigationControllerImpl sourceImpl = (NavigationControllerImpl) source;
-        if (sourceImpl.mNativeNavigationControllerAndroid == 0) return;
-        nativeCopyStateFrom(mNativeNavigationControllerAndroid,
-                sourceImpl.mNativeNavigationControllerAndroid, needsReload);
-    }
-
-    @Override
-    public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry) {
-        if (mNativeNavigationControllerAndroid == 0) return;
-        NavigationControllerImpl sourceImpl = (NavigationControllerImpl) source;
-        if (sourceImpl.mNativeNavigationControllerAndroid == 0) return;
-        nativeCopyStateFromAndPrune(
-                mNativeNavigationControllerAndroid,
-                sourceImpl.mNativeNavigationControllerAndroid,
-                replaceEntry);
-    }
-
     @Override
     public String getEntryExtraData(int index, String key) {
         if (mNativeNavigationControllerAndroid == 0) return null;
@@ -327,8 +288,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
             Object history);
     private native void nativeGetDirectedNavigationHistory(long nativeNavigationControllerAndroid,
             NavigationHistory history, boolean isForward, int itemLimit);
-    private native String nativeGetOriginalUrlForVisibleNavigationEntry(
-            long nativeNavigationControllerAndroid);
     private native void nativeClearSslPreferences(long nativeNavigationControllerAndroid);
     private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationControllerAndroid);
     private native void nativeSetUseDesktopUserAgent(long nativeNavigationControllerAndroid,
@@ -339,13 +298,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
     private native int nativeGetLastCommittedEntryIndex(long nativeNavigationControllerAndroid);
     private native boolean nativeRemoveEntryAtIndex(long nativeNavigationControllerAndroid,
             int index);
-    private native boolean nativeCanCopyStateOver(long nativeNavigationControllerAndroid);
-    private native boolean nativeCanPruneAllButLastCommitted(
-            long nativeNavigationControllerAndroid);
-    private native void nativeCopyStateFrom(long nativeNavigationControllerAndroid,
-            long sourceNavigationControllerAndroid, boolean needsReload);
-    private native void nativeCopyStateFromAndPrune(long nativeNavigationControllerAndroid,
-            long sourceNavigationControllerAndroid, boolean replaceEntry);
     private native String nativeGetEntryExtraData(
             long nativeNavigationControllerAndroid, int index, String key);
     private native void nativeSetEntryExtraData(

content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java

@@ -102,7 +102,6 @@ public interface NavigationController {
      * Clears NavigationController's page history in both backwards and
      * forwards directions.
      */
-    @VisibleForTesting
     public void clearHistory();
 
     /**
@@ -121,13 +120,6 @@ public interface NavigationController {
     */
     public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit);
 
-    /**
-     * Get Original URL for current Navigation entry of NavigationController.
-     * @return The original request URL for the current navigation entry, or null if there is no
-     *         current entry.
-     */
-    public String getOriginalUrlForVisibleNavigationEntry();
-
     /**
      * Clears SSL preferences for this NavigationController.
      */
@@ -172,32 +164,6 @@ public interface NavigationController {
      */
     public boolean removeEntryAtIndex(int index);
 
-    /**
-     * @return Whether it is safe to call CopyStateFrom (i.e. the navigation state is empty).
-     */
-    public boolean canCopyStateOver();
-
-    /**
-     * @return Whether it is safe to call CopyStateFromAndPrune.
-     */
-    public boolean canPruneAllButLastCommitted();
-
-    /**
-     * Copies the navigation state from the given controller to this one. This one should be empty.
-     * @param source A source of the navigation state
-     * @param needsReload Indicates whether a reload needs to happen when activated.
-     */
-    public void copyStateFrom(NavigationController source, boolean needsReload);
-
-    /**
-     * A variant of CopyStateFrom. Removes all entries from this except the last committed entry,
-     * and inserts all entries from |source| before and including its last committed entry.
-     * See navigation_controller.h for more detailed description.
-     * @param source A source of the navigation state
-     * @param replaceEntry Whether to replace the current entry in source
-     */
-    public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry);
-
     /**
      * Gets extra data on the {@link NavigationEntry} at {@code index}.
      * @param index The index of the navigation entry.