Add a param for default browser promo to allow promo with url launching

1. Remove intent data if this intent is sent out by default browser
promo utils to prevent from launching a new tab.
2. Promo with different category and action if url is provided.

Bug: 1090103
Change-Id: Icd982617d637f812511eb3872a005076f9882df5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2295207
Commit-Queue: Lijin Shen <lazzzis@google.com>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788186}

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -862,6 +862,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             return;
         }
 
+        DefaultBrowserPromoUtils.maybeRemoveIntentData(intent);
         mIntentHandlingTimeMs = SystemClock.uptimeMillis();
         super.onNewIntent(intent);
     }

chrome/browser/ui/android/default_browser_promo/java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoManager.java

@@ -9,6 +9,7 @@ import android.app.Activity;
 import android.app.role.RoleManager;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
 
@@ -32,6 +33,7 @@ import org.chromium.ui.base.WindowAndroid;
 public class DefaultBrowserPromoManager implements PauseResumeWithNativeObserver, Destroyable {
     private static final String SKIP_PRIMER_PARAM = "skip_primer";
     private static final String DISABLE_DISAMBIGUATION_SHEET = "disable_disambiguation_sheet";
+    private static final String DISAMBIGUATION_PROMO_URL = "disambiguation_promo_url";
 
     private final Activity mActivity;
     private DefaultBrowserPromoDialog mDialog;
@@ -145,8 +147,17 @@ public class DefaultBrowserPromoManager implements PauseResumeWithNativeObserver
             DefaultBrowserPromoMetrics.recordUiDismissalReason(
                     mCurrentState, UIDismissalReason.CHANGE_DEFAULT);
 
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.addCategory(Intent.CATEGORY_APP_BROWSER);
+            Intent intent = new Intent();
+            String url = ChromeFeatureList.getFieldTrialParamByFeature(
+                    ChromeFeatureList.ANDROID_DEFAULT_BROWSER_PROMO, DISAMBIGUATION_PROMO_URL);
+            if (url != null && !url.isEmpty()) {
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.addCategory(Intent.CATEGORY_BROWSABLE);
+                intent.setData(Uri.parse(url));
+            } else {
+                intent.setAction(Intent.ACTION_MAIN);
+                intent.addCategory(Intent.CATEGORY_APP_BROWSER);
+            }
             intent.putExtra(DefaultBrowserPromoUtils.DISAMBIGUATION_SHEET_PROMOED_KEY, true);
             mActivity.startActivity(intent);
         });

chrome/browser/ui/android/default_browser_promo/java/src/org/chromium/chrome/browser/ui/default_browser_promo/DefaultBrowserPromoUtils.java

@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.ui.default_browser_promo;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.text.TextUtils;
 
 import androidx.annotation.IntDef;
@@ -192,6 +193,17 @@ public class DefaultBrowserPromoUtils {
         }
     }
 
+    /**
+     * Remove intent data if this intent is triggered by default browser promo; Otherwise,
+     * chrome will open a new tab.
+     */
+    public static void maybeRemoveIntentData(Intent intent) {
+        if (intent.getBooleanExtra(DISAMBIGUATION_SHEET_PROMOED_KEY, false)) {
+            // Intent with Uri.EMPTY as data will be ignored by the IntentHandler.
+            intent.setData(Uri.EMPTY);
+        }
+    }
+
     @VisibleForTesting
     static boolean isChromePreStableInstalled() {
         for (ResolveInfo info : PackageManagerUtils.queryAllWebBrowsersInfo()) {