Remove unnecessary Tab params from ExternalNavHandler(Delegate).

The ExternalNavigationHandlerDelegateImpl gets passed a Tab as a
parameter when we create an ExternalNavigationHandler, and this
doesn't change for its lifespan. The Tab in question is passed in from
the call to Tab#attach, which creates a brand new
InterceptNavigationDelegate which in turn ends up creating the
ExternalNavigationHandlerDelegate.

Bug: 651205
Change-Id: Iba4cfb154c5374ff931b35211246975f9cdd7892
Reviewed-on: https://chromium-review.googlesource.com/952274Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541445}

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java

@@ -88,10 +88,9 @@ interface ExternalNavigationDelegate {
 
     /**
      * @param url The requested url.
-     * @param tab The current tab.
      * @return Whether we should block the navigation and request file access before proceeding.
      */
-    boolean shouldRequestFileAccess(String url, Tab tab);
+    boolean shouldRequestFileAccess(String url);
 
     /**
      * Trigger a UI affordance that will ask the user to grant file access.  After the access
@@ -99,10 +98,9 @@ interface ExternalNavigationDelegate {
      *
      * @param intent The intent to continue loading the file URL.
      * @param referrerUrl The HTTP referrer URL.
-     * @param tab The current tab.
      * @param needsToCloseTab Whether this action should close the current tab.
      */
-    void startFileIntent(Intent intent, String referrerUrl, Tab tab, boolean needsToCloseTab);
+    void startFileIntent(Intent intent, String referrerUrl, boolean needsToCloseTab);
 
     /**
      * Launches a Chrome Custom Tab to be shown on top of a WebappActivity.
@@ -117,11 +115,10 @@ interface ExternalNavigationDelegate {
      *
      * @param url The new URL after clobbering the current tab.
      * @param referrerUrl The HTTP referrer URL.
-     * @param tab The current tab.
      * @return OverrideUrlLoadingResult (if the tab has been clobbered, or we're launching an
      *         intent.)
      */
-    OverrideUrlLoadingResult clobberCurrentTab(String url, String referrerUrl, Tab tab);
+    OverrideUrlLoadingResult clobberCurrentTab(String url, String referrerUrl);
 
     /** Adds a window id to the intent, if necessary. */
     void maybeSetWindowId(Intent intent);
@@ -147,20 +144,17 @@ interface ExternalNavigationDelegate {
     /**
      * Check if the URL should be handled by an instant app, or kick off an async request for an
      * instant app banner.
-     * @param tab The current tab.
      * @param url The current URL.
      * @param referrerUrl The referrer URL.
      * @param isIncomingRedirect Whether we are handling an incoming redirect to an instant app.
      * @return Whether we launched an instant app.
      */
-    boolean maybeLaunchInstantApp(Tab tab, String url, String referrerUrl,
-            boolean isIncomingRedirect);
+    boolean maybeLaunchInstantApp(String url, String referrerUrl, boolean isIncomingRedirect);
 
     /**
-     * @param tab The current tab.
      * @return whether this navigation is from the search results page.
      */
-    boolean isSerpReferrer(Tab tab);
+    boolean isSerpReferrer();
 
     /**
      * @return The previously committed URL from the WebContents.

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java

@@ -230,9 +230,8 @@ public class ExternalNavigationHandler {
         // to Chrome.  This check should happen for reloads, navigations, etc..., which is why
         // it occurs before the subsequent blocks.
         if (params.getUrl().startsWith(UrlConstants.FILE_URL_SHORT_PREFIX)
-                && mDelegate.shouldRequestFileAccess(params.getUrl(), params.getTab())) {
-            mDelegate.startFileIntent(
-                    intent, params.getReferrerUrl(), params.getTab(),
+                && mDelegate.shouldRequestFileAccess(params.getUrl())) {
+            mDelegate.startFileIntent(intent, params.getReferrerUrl(),
                     params.shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent());
             if (DEBUG) Log.i(TAG, "OVERRIDE_WITH_ASYNC_ACTION: Requesting filesystem access");
             return OverrideUrlLoadingResult.OVERRIDE_WITH_ASYNC_ACTION;
@@ -259,12 +258,10 @@ public class ExternalNavigationHandler {
             if (handler.shouldStayInChrome(isExternalProtocol)
                     || handler.shouldNotOverrideUrlLoading()) {
                 // http://crbug.com/659301: Handle redirects to Instant Apps out of Custom Tabs.
-                if (handler.isFromCustomTabIntent()
-                        && !isExternalProtocol
-                        && incomingIntentRedirect
+                if (handler.isFromCustomTabIntent() && !isExternalProtocol && incomingIntentRedirect
                         && !handler.shouldNavigationTypeStayInChrome()
-                        && mDelegate.maybeLaunchInstantApp(params.getTab(), params.getUrl(),
-                                params.getReferrerUrl(), true)) {
+                        && mDelegate.maybeLaunchInstantApp(
+                                   params.getUrl(), params.getReferrerUrl(), true)) {
                     if (DEBUG) {
                         Log.i(TAG, "OVERRIDE_WITH_EXTERNAL_INTENT: Launching redirect to "
                                 + "an instant app");
@@ -439,13 +436,14 @@ public class ExternalNavigationHandler {
         // startActivityIfNeeded or startActivity.
         if (!isExternalProtocol) {
             if (mDelegate.countSpecializedHandlers(resolvingInfos) == 0) {
-                if (incomingIntentRedirect && mDelegate.maybeLaunchInstantApp(
-                        params.getTab(), params.getUrl(), params.getReferrerUrl(), true)) {
+                if (incomingIntentRedirect
+                        && mDelegate.maybeLaunchInstantApp(
+                                   params.getUrl(), params.getReferrerUrl(), true)) {
                     if (DEBUG) Log.i(TAG, "OVERRIDE_WITH_EXTERNAL_INTENT: Instant Apps redirect");
                     return OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT;
                 } else if (linkNotFromIntent && !params.isIncognito()
-                        && mDelegate.maybeLaunchInstantApp(params.getTab(), params.getUrl(),
-                                params.getReferrerUrl(), false)) {
+                        && mDelegate.maybeLaunchInstantApp(
+                                   params.getUrl(), params.getReferrerUrl(), false)) {
                     if (DEBUG) Log.i(TAG, "OVERRIDE_WITH_EXTERNAL_INTENT: Instant Apps link");
                     return OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT;
                 }
@@ -511,8 +509,7 @@ public class ExternalNavigationHandler {
 
         boolean isDirectInstantAppsIntent =
                 isExternalProtocol && InstantAppsHandler.isIntentToInstantApp(intent);
-        boolean shouldProxyForInstantApps = isDirectInstantAppsIntent
-                && mDelegate.isSerpReferrer(params.getTab());
+        boolean shouldProxyForInstantApps = isDirectInstantAppsIntent && mDelegate.isSerpReferrer();
         if (shouldProxyForInstantApps) {
             RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",
                     AIA_INTENT_SERP, AIA_INTENT_BOUNDARY);
@@ -674,8 +671,7 @@ public class ExternalNavigationHandler {
             params.getRedirectHandler().setShouldNotOverrideUrlLoadingUntilNewUrlLoading();
         }
         if (DEBUG) Log.i(TAG, "OVERRIDE: clobberCurrentTab called");
-        return mDelegate.clobberCurrentTab(
-                browserFallbackUrl, params.getReferrerUrl(), params.getTab());
+        return mDelegate.clobberCurrentTab(browserFallbackUrl, params.getReferrerUrl());
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java

@@ -1561,13 +1561,12 @@ public class ExternalNavigationHandlerTest {
         }
 
         @Override
-        public boolean shouldRequestFileAccess(String url, Tab tab) {
+        public boolean shouldRequestFileAccess(String url) {
             return shouldRequestFileAccess;
         }
 
         @Override
-        public void startFileIntent(Intent intent, String referrerUrl, Tab tab,
-                boolean needsToCloseTab) {
+        public void startFileIntent(Intent intent, String referrerUrl, boolean needsToCloseTab) {
             startFileIntentCalled = true;
         }
 
@@ -1577,8 +1576,7 @@ public class ExternalNavigationHandlerTest {
         }
 
         @Override
-        public OverrideUrlLoadingResult clobberCurrentTab(
-                String url, String referrerUrl, Tab tab) {
+        public OverrideUrlLoadingResult clobberCurrentTab(String url, String referrerUrl) {
             mNewUrlAfterClobbering = url;
             mReferrerUrlForClobbering = referrerUrl;
             return OverrideUrlLoadingResult.OVERRIDE_WITH_CLOBBERING_TAB;
@@ -1608,13 +1606,13 @@ public class ExternalNavigationHandlerTest {
         }
 
         @Override
-        public boolean maybeLaunchInstantApp(Tab tab, String url, String referrerUrl,
-                boolean isIncomingRedirect) {
+        public boolean maybeLaunchInstantApp(
+                String url, String referrerUrl, boolean isIncomingRedirect) {
             return mCanHandleWithInstantApp;
         }
 
         @Override
-        public boolean isSerpReferrer(Tab tab) {
+        public boolean isSerpReferrer() {
             return mIsSerpReferrer;
         }