[Android] Move knowledge of IntentHandler out of ExternalNavHandler

This CL moves knowledge of the //chrome-level IntentHandler out of
ExternalNavigationHandler.java. This dependence is to set
//chrome-level extras on the intent (and set state of IntentHandler
itself). We abstract this functionality through
ExternalNavigationDelegate, following the pattern of similar
already-existing delegate methods.

Bug: 1031465
Change-Id: I0301abdcf045dfdada1506cf5f14dd7c98315f86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087404
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747621}

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

@@ -111,6 +111,15 @@ interface ExternalNavigationDelegate {
     /** Adds the package name of a specialized intent handler. */
     void maybeRecordAppHandlersInIntent(Intent intent, List<ResolveInfo> info);
 
+    /** Records the pending referrer if desired. */
+    void maybeSetPendingReferrer(Intent intent, @NonNull String referrerUrl);
+
+    /**
+     * Records the pending incognito URL if desired. Called only if the
+     * navigation is occurring in the context of incognito mode.
+     */
+    void maybeSetPendingIncognitoUrl(Intent intent);
+
     /**
      * Determine if the Chrome app is in the foreground.
      */

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

@@ -587,6 +587,16 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
                 getSpecializedHandlersWithFilter(infos, null));
     }
 
+    @Override
+    public void maybeSetPendingReferrer(Intent intent, String referrerUrl) {
+        IntentHandler.setPendingReferrer(intent, referrerUrl);
+    }
+
+    @Override
+    public void maybeSetPendingIncognitoUrl(Intent intent) {
+        IntentHandler.setPendingIncognitoUrl(intent);
+    }
+
     @Override
     public boolean isSerpReferrer() {
         // TODO (thildebr): Investigate whether or not we can use getLastCommittedUrl() instead of

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

@@ -26,7 +26,6 @@ import org.chromium.base.IntentUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
@@ -671,10 +670,10 @@ public class ExternalNavigationHandler {
         mDelegate.maybeRecordAppHandlersInIntent(targetIntent, resolvingInfos);
 
         if (params.getReferrerUrl() != null) {
-            IntentHandler.setPendingReferrer(targetIntent, params.getReferrerUrl());
+            mDelegate.maybeSetPendingReferrer(targetIntent, params.getReferrerUrl());
         }
 
-        if (params.isIncognito()) IntentHandler.setPendingIncognitoUrl(targetIntent);
+        if (params.isIncognito()) mDelegate.maybeSetPendingIncognitoUrl(targetIntent);
 
         if (shouldProxyForInstantApps) {
             RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",

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

@@ -20,6 +20,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
@@ -247,6 +248,42 @@ import java.util.List;
                 delegate.isPdfDownload("http://somesampleurldne.com/copy.txt"));
     }
 
+    @Test
+    @SmallTest
+    public void testMaybeSetPendingIncognitoUrl() {
+        ExternalNavigationDelegateImpl delegate = new ExternalNavigationDelegateImpl(
+                mActivityTestRule.getActivity().getActivityTab());
+
+        String url = "http://www.example.com";
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+
+        delegate.maybeSetPendingIncognitoUrl(intent);
+
+        Assert.assertTrue(
+                intent.getBooleanExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false));
+        Assert.assertEquals(url, IntentHandler.getPendingIncognitoUrl());
+    }
+
+    @Test
+    @SmallTest
+    public void testMaybeSetPendingReferrer() {
+        ExternalNavigationDelegateImpl delegate = new ExternalNavigationDelegateImpl(
+                mActivityTestRule.getActivity().getActivityTab());
+
+        String url = "http://www.example.com";
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+
+        String referrerUrl = "http://www.example-referrer.com";
+        delegate.maybeSetPendingReferrer(intent, referrerUrl);
+
+        Assert.assertEquals(
+                Uri.parse(referrerUrl), intent.getParcelableExtra(Intent.EXTRA_REFERRER));
+        Assert.assertEquals(1, intent.getIntExtra(IntentHandler.EXTRA_REFERRER_ID, 0));
+        Assert.assertEquals(referrerUrl, IntentHandler.getPendingReferrerUrl(1));
+    }
+
     @Before
     public void setUp() throws InterruptedException {
         mActivityTestRule.startMainActivityOnBlankPage();

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

@@ -33,7 +33,6 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.DisableIf;
-import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
@@ -1248,8 +1247,6 @@ public class ExternalNavigationHandlerTest {
                         START_OTHER_ACTIVITY);
         Assert.assertEquals(Uri.parse(referrer),
                 mDelegate.startActivityIntent.getParcelableExtra(Intent.EXTRA_REFERRER));
-        Assert.assertEquals(
-                1, mDelegate.startActivityIntent.getIntExtra(IntentHandler.EXTRA_REFERRER_ID, 0));
     }
 
     @Test
@@ -1864,6 +1861,16 @@ public class ExternalNavigationHandlerTest {
         public void maybeRecordAppHandlersInIntent(Intent intent, List<ResolveInfo> info) {
         }
 
+        @Override
+        public void maybeSetPendingReferrer(Intent intent, String referrerUrl) {
+            // This is used in a test to check that ExternalNavigationHandler correctly passes
+            // this data to the delegate when the referrer URL is non-null.
+            intent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(referrerUrl));
+        }
+
+        @Override
+        public void maybeSetPendingIncognitoUrl(Intent intent) {}
+
         @Override
         public boolean isChromeAppInForeground() {
             return mIsChromeAppInForeground;