Revert "Changed NavigationController access to through tab in Java code"

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
index aa178a39983e055516f28f1a2d8e3e1e858a981a..2b8c941161185c1abf5aebdf9ef537c28a67fd19 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
@@ -12,10 +12,11 @@ import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
+import org.chromium.content_public.browser.NavigationController;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ConsoleMessageLevel;
 
 /**
@@ -170,22 +171,27 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
      * entries from the navigation history. See crbug.com/426679
      */
     public void maybeUpdateNavigationHistory() {
-        NavigationHandler navigationHandler = mTab.getNavigationHandler();
-        if (mClearAllForwardHistoryRequired && navigationHandler != null) {
+        WebContents webContents = mTab.getWebContents();
+        if (mClearAllForwardHistoryRequired && webContents != null) {
+            NavigationController navigationController =
+                    webContents.getNavigationController();
             int lastCommittedEntryIndex = getLastCommittedEntryIndex();
-            while (navigationHandler.canGoForward()) {
-                boolean ret = navigationHandler.removeEntryAtIndex(
+            while (navigationController.canGoForward()) {
+                boolean ret = navigationController.removeEntryAtIndex(
                         lastCommittedEntryIndex + 1);
                 assert ret;
             }
-        } else if (mShouldClearRedirectHistoryForTabClobbering && navigationHandler != null) {
+        } else if (mShouldClearRedirectHistoryForTabClobbering
+                && webContents != null) {
             // http://crbug/479056: Even if we clobber the current tab, we want to remove
             // redirect history to be consistent.
+            NavigationController navigationController =
+                    webContents.getNavigationController();
             int indexBeforeRedirection = mTab.getTabRedirectHandler()
                     .getLastCommittedEntryIndexBeforeStartingNavigation();
             int lastCommittedEntryIndex = getLastCommittedEntryIndex();
             for (int i = lastCommittedEntryIndex - 1; i > indexBeforeRedirection; --i) {
-                boolean ret = navigationHandler.removeEntryAtIndex(i);
+                boolean ret = navigationController.removeEntryAtIndex(i);
                 assert ret;
             }
         }
@@ -198,13 +204,13 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
     }
 
     private int getLastCommittedEntryIndex() {
-        if (mTab.getNavigationHandler() == null) return -1;
-        return mTab.getNavigationHandler().getLastCommittedEntryIndex();
+        if (mTab.getWebContents() == null) return -1;
+        return mTab.getWebContents().getNavigationController().getLastCommittedEntryIndex();
     }
 
     private boolean shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent() {
-        if (mTab.getNavigationHandler() == null) return false;
-        if (!mTab.getNavigationHandler().canGoToOffset(0)) return true;
+        if (mTab.getWebContents() == null) return false;
+        if (!mTab.getWebContents().getNavigationController().canGoToOffset(0)) return true;
 
         // http://crbug/415948 : if the last committed entry index which was saved before this
         // navigation is invalid, it means that this navigation is the first one since this tab was
@@ -221,7 +227,7 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
      * Called when Chrome decides to override URL loading and show an intent picker.
      */
     private void onOverrideUrlLoadingAndLaunchIntent() {
-        if (mTab.getNavigationHandler() == null) return;
+        if (mTab.getWebContents() == null) return;
 
         // Before leaving Chrome, close the empty child tab.
         // If a new tab is created through JavaScript open to load this
@@ -243,7 +249,7 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
                 // was saved before this navigation, and remove the empty entries from the
                 // navigation history.
                 mClearAllForwardHistoryRequired = true;
-                mTab.getNavigationHandler().goToNavigationIndex(
+                mTab.getWebContents().getNavigationController().goToNavigationIndex(
                         lastCommittedEntryIndexBeforeNavigation);
             }
         }