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

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.tab;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 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;
 
 /**
  * Class that controls navigations and allows to intercept them. It is used on Android to 'convert'
  * certain navigations to Intents to 3rd party applications and to "pause" navigations when data use
  * tracking has ended.
  */
 public class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate {
     private final Tab mTab;
     private final ExternalNavigationHandler mExternalNavHandler;
@@ skipping 134 matching lines @@
                 .setShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent(
                         shouldCloseTab && navigationParams.isMainFrame);
     }
 
     /**
      * Updates navigation history if navigation is canceled due to intent handler. We go back to the
      * last committed entry index which was saved before the navigation, and remove the empty
      * 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;
             }
         }
         mClearAllForwardHistoryRequired = false;
         mShouldClearRedirectHistoryForTabClobbering = false;
     }
 
     AuthenticatorNavigationInterceptor getAuthenticatorNavigationInterceptor() {
         return mAuthenticatorHelper;
     }
 
     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
         // created.
         // In such case, we would like to close this tab.
         if (mTab.getTabRedirectHandler().isOnNavigation()) {
             return mTab.getTabRedirectHandler().getLastCommittedEntryIndexBeforeStartingNavigation()
                     == TabRedirectHandler.INVALID_ENTRY_INDEX;
         }
         return false;
     }
 
     /**
      * 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
         // url, we would like to close it as we will load this url in a
         // different Activity.
         if (shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent()) {
             if (mTab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP) {
                 // Moving task back before closing the tab allows back button to function better
                 // when Chrome was an intermediate link redirector between two apps.
                 // crbug.com/487938.
                 mTab.getActivity().moveTaskToBack(true);
             }
             mTab.getTabModelSelector().closeTab(mTab);
         } else if (mTab.getTabRedirectHandler().isOnNavigation()) {
             int lastCommittedEntryIndexBeforeNavigation = mTab.getTabRedirectHandler()
                     .getLastCommittedEntryIndexBeforeStartingNavigation();
             if (getLastCommittedEntryIndex() > lastCommittedEntryIndexBeforeNavigation) {
                 // http://crbug/426679 : we want to go back to the last committed entry index which
                 // was saved before this navigation, and remove the empty entries from the
                 // navigation history.
                 mClearAllForwardHistoryRequired = true;
-                mTab.getNavigationHandler().goToNavigationIndex(
+                mTab.getWebContents().getNavigationController().goToNavigationIndex(
                         lastCommittedEntryIndexBeforeNavigation);
             }
         }
     }
 
     private void logBlockedNavigationToDevToolsConsole(String url) {
         int resId = mExternalNavHandler.canExternalAppHandleUrl(url)
                 ? R.string.blocked_navigation_warning
                 : R.string.unreachable_navigation_warning;
         mTab.getWebContents().addMessageToDevToolsConsole(
                 ConsoleMessageLevel.WARNING, mTab.getApplicationContext().getString(resId, url));
     }
 }