Dont cache activity for external navigation handling

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.chrome.R;
-import org.chromium.chrome.browser.ChromeActivity;
 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.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 ChromeActivity mActivity;
     private final Tab mTab;
     private final ExternalNavigationHandler mExternalNavHandler;
     private final AuthenticatorNavigationInterceptor mAuthenticatorHelper;
     private ExternalNavigationHandler.OverrideUrlLoadingResult mLastOverrideUrlLoadingResult =
             ExternalNavigationHandler.OverrideUrlLoadingResult.NO_OVERRIDE;
 
     /**
      * Whether forward history should be cleared after navigation is committed.
      */
     private boolean mClearAllForwardHistoryRequired;
     private boolean mShouldClearRedirectHistoryForTabClobbering;
 
     /**
      * Default constructor of {@link InterceptNavigationDelegateImpl}.
      */
-    public InterceptNavigationDelegateImpl(ChromeActivity activity, Tab tab) {
-        this(new ExternalNavigationHandler(activity), activity, tab);
+    public InterceptNavigationDelegateImpl(Tab tab) {
+        this(new ExternalNavigationHandler(tab), tab);
     }
 
     /**
      * Constructs a new instance of {@link InterceptNavigationDelegateImpl} with the given
      * {@link ExternalNavigationHandler}.
      */
-    public InterceptNavigationDelegateImpl(ExternalNavigationHandler externalNavHandler,
-            ChromeActivity activity, Tab tab) {
-        mActivity = activity;
+    public InterceptNavigationDelegateImpl(ExternalNavigationHandler externalNavHandler, Tab tab) {
         mTab = tab;
         mExternalNavHandler = externalNavHandler;
         mAuthenticatorHelper = ((ChromeApplication) mTab.getApplicationContext())
                 .createAuthenticatorNavigationInterceptor(mTab);
     }
 
     public boolean shouldIgnoreNewTab(String url, boolean incognito) {
         if (mAuthenticatorHelper != null && mAuthenticatorHelper.handleAuthenticatorUrl(url)) {
             return true;
         }
@@ skipping 16 matching lines @@
         String url = navigationParams.url;
 
         if (mAuthenticatorHelper != null && mAuthenticatorHelper.handleAuthenticatorUrl(url)) {
             return true;
         }
 
         TabRedirectHandler tabRedirectHandler = mTab.getTabRedirectHandler();
         tabRedirectHandler.updateNewUrlLoading(navigationParams.pageTransitionType,
                 navigationParams.isRedirect,
                 navigationParams.hasUserGesture || navigationParams.hasUserGestureCarryover,
-                mActivity.getLastUserInteractionTime(), getLastCommittedEntryIndex());
+                mTab.getActivity().getLastUserInteractionTime(), getLastCommittedEntryIndex());
         boolean shouldCloseTab = shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent();
         boolean isInitialTabLaunchInBackground =
                 mTab.getLaunchType() == TabLaunchType.FROM_LONGPRESS_BACKGROUND && shouldCloseTab;
         // http://crbug.com/448977: If a new tab is closed by this overriding, we should open an
         // Intent in a new tab when Chrome receives it again.
         ExternalNavigationParams params = new ExternalNavigationParams.Builder(
                 url, mTab.isIncognito(), navigationParams.referrer,
                 navigationParams.pageTransitionType,
                 navigationParams.isRedirect)
                 .setTab(mTab)
@@ skipping 22 matching lines @@
                 if (!shouldCloseTab && navigationParams.isMainFrame) {
                     onOverrideUrlLoadingAndLaunchIntent();
                 }
                 return true;
             case NO_OVERRIDE:
             default:
                 if (navigationParams.isExternalProtocol) {
                     logBlockedNavigationToDevToolsConsole(url);
                     return true;
                 }
-                return DataUseTabUIManager.shouldOverrideUrlLoading(mActivity, mTab, url,
+                return DataUseTabUIManager.shouldOverrideUrlLoading(mTab.getActivity(), mTab, url,
                         navigationParams.pageTransitionType, navigationParams.referrer);
         }
     }
 
     /**
      * 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() {
@@ skipping 57 matching lines @@
 
         // 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.
-                mActivity.moveTaskToBack(true);
+                mTab.getActivity().moveTaskToBack(true);
             }
-            mActivity.getTabModelSelector().closeTab(mTab);
+            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.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));
     }
 }