[Android WebAPK] Remove logic for handling unused 'URL' in shares

This CL:
- Stops passing the "share_target">"params">"url" JSON parameter
from the Web Manifest to the WebAPK server
- Stops using the "share_target">"params">"url" in determining whether
the WebAPK needs to be updated

BUG=993651

Change-Id: Iaca496e9acccaad8edb590d496cb40b559a3a9ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1759050
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Pavel Shmakov <pshmakov@chromium.org>
Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710113}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/sharing/TwaSharingController.java

@@ -95,7 +95,6 @@ public class TwaSharingController {
         String action = shareTarget.action;
         String paramTitle = params.title;
         String paramText = params.text;
-        String paramUrl = ""; // Not supported on Android
         String method = shareTarget.method;
         boolean isPost = method != null && "POST".equals(method.toUpperCase(Locale.ENGLISH));
         String encodingType = shareTarget.encodingType;
@@ -110,8 +109,8 @@ public class TwaSharingController {
             filesArray[i] = file.name;
             acceptsArray[i] =  file.acceptedTypes.toArray(new String[file.acceptedTypes.size()]);
         }
-        return new WebApkInfo.ShareTarget(action, paramTitle, paramText, paramUrl, isPost,
-                isMultipart, filesArray, acceptsArray);
+        return new WebApkInfo.ShareTarget(
+                action, paramTitle, paramText, isPost, isMultipart, filesArray, acceptsArray);
     }
 
     private boolean sendPost(ShareData shareData, WebApkInfo.ShareTarget target) {

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java

@@ -38,7 +38,6 @@ public class WebApkInfo extends WebappInfo {
         private static final int ACTION_INDEX = 0;
         private static final int PARAM_TITLE_INDEX = 1;
         private static final int PARAM_TEXT_INDEX = 2;
-        private static final int PARAM_URL_INDEX = 3;
         private String[] mData;
         private boolean mIsShareMethodPost;
         private boolean mIsShareEncTypeMultipart;
@@ -46,17 +45,15 @@ public class WebApkInfo extends WebappInfo {
         private String[][] mFileAccepts;
 
         public ShareTarget() {
-            this(null, null, null, null, false, false, null, null);
+            this(null, null, null, false, false, null, null);
         }
 
-        public ShareTarget(String action, String paramTitle, String paramText, String paramUrl,
-                boolean isMethodPost, boolean isEncTypeMultipart, String[] fileNames,
-                String[][] fileAccepts) {
-            mData = new String[4];
+        public ShareTarget(String action, String paramTitle, String paramText, boolean isMethodPost,
+                boolean isEncTypeMultipart, String[] fileNames, String[][] fileAccepts) {
+            mData = new String[3];
             mData[ACTION_INDEX] = replaceNullWithEmpty(action);
             mData[PARAM_TITLE_INDEX] = replaceNullWithEmpty(paramTitle);
             mData[PARAM_TEXT_INDEX] = replaceNullWithEmpty(paramText);
-            mData[PARAM_URL_INDEX] = replaceNullWithEmpty(paramUrl);
             mIsShareMethodPost = isMethodPost;
             mIsShareEncTypeMultipart = isEncTypeMultipart;
 
@@ -87,10 +84,6 @@ public class WebApkInfo extends WebappInfo {
             return mData[PARAM_TEXT_INDEX];
         }
 
-        public String getParamUrl() {
-            return mData[PARAM_URL_INDEX];
-        }
-
         public boolean isShareMethodPost() {
             return mIsShareMethodPost;
         }

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProvider.java

@@ -533,8 +533,6 @@ public class WebApkIntentDataProvider extends BrowserServicesIntentDataProvider
                             shareTargetMetaData, WebApkMetaDataKeys.SHARE_PARAM_TITLE),
                     IntentUtils.safeGetString(
                             shareTargetMetaData, WebApkMetaDataKeys.SHARE_PARAM_TEXT),
-                    IntentUtils.safeGetString(
-                            shareTargetMetaData, WebApkMetaDataKeys.SHARE_PARAM_URL),
                     isShareMethodPost, isShareEncTypeMultipart, fileNames, fileAccepts);
 
             return new Pair<>(shareTargetActivityName, target);

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java

@@ -107,7 +107,7 @@ public class WebApkUpdateDataFetcher extends EmptyTabObserver {
             String badgeIconMurmur2Hash, Bitmap badgeIconBitmap, String[] iconUrls,
             @WebDisplayMode int displayMode, int orientation, long themeColor, long backgroundColor,
             String shareAction, String shareParamsTitle, String shareParamsText,
-            String shareParamsUrl, boolean isShareMethodPost, boolean isShareEncTypeMultipart,
+            boolean isShareMethodPost, boolean isShareEncTypeMultipart,
             String[] shareParamsFileNames, String[][] shareParamsAccepts) {
         Context appContext = ContextUtils.getApplicationContext();
 
@@ -126,8 +126,8 @@ public class WebApkUpdateDataFetcher extends EmptyTabObserver {
         WebApkInfo.ShareTarget shareTarget = TextUtils.isEmpty(shareAction)
                 ? new WebApkInfo.ShareTarget()
                 : new WebApkInfo.ShareTarget(shareAction, shareParamsTitle, shareParamsText,
-                        shareParamsUrl, isShareMethodPost, isShareEncTypeMultipart,
-                        shareParamsFileNames, shareParamsAccepts);
+                        isShareMethodPost, isShareEncTypeMultipart, shareParamsFileNames,
+                        shareParamsAccepts);
 
         int defaultBackgroundColor = SplashLayout.getDefaultBackgroundColor(appContext);
         WebApkInfo info = WebApkInfo.create(mOldInfo.url(), scopeUrl,

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java

@@ -381,8 +381,7 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
                 info.badgeIcon().bitmap(), iconUrls, iconHashes, info.displayMode(),
                 info.orientation(), info.toolbarColor(), info.backgroundColor(),
                 info.shareTarget().getAction(), info.shareTarget().getParamTitle(),
-                info.shareTarget().getParamText(), info.shareTarget().getParamUrl(),
-                info.shareTarget().isShareMethodPost(),
+                info.shareTarget().getParamText(), info.shareTarget().isShareMethodPost(),
                 info.shareTarget().isShareEncTypeMultipart(), info.shareTarget().getFileNames(),
                 info.shareTarget().getFileAccepts(), info.manifestUrl(), info.webApkPackageName(),
                 versionCode, isManifestStale, updateReason, callback);
@@ -396,11 +395,10 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
                 Bitmap badgeIcon, String[] iconUrls, String[] iconHashes,
                 @WebDisplayMode int displayMode, int orientation, long themeColor,
                 long backgroundColor, String shareTargetAction, String shareTargetParamTitle,
-                String shareTargetParamText, String shareTargetParamUrl,
-                boolean shareTargetParamIsMethodPost, boolean shareTargetParamIsEncTypeMultipart,
-                String[] shareTargetParamFileNames, Object[] shareTargetParamAccepts,
-                String manifestUrl, String webApkPackage, int webApkVersion,
-                boolean isManifestStale, @WebApkUpdateReason int updateReason,
+                String shareTargetParamText, boolean shareTargetParamIsMethodPost,
+                boolean shareTargetParamIsEncTypeMultipart, String[] shareTargetParamFileNames,
+                Object[] shareTargetParamAccepts, String manifestUrl, String webApkPackage,
+                int webApkVersion, boolean isManifestStale, @WebApkUpdateReason int updateReason,
                 Callback<Boolean> callback);
         public void updateWebApkFromFile(String updateRequestPath, WebApkUpdateCallback callback);
     }

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkShareTargetUtilTest.java

@@ -79,7 +79,7 @@ public class WebApkShareTargetUtilTest {
             if (mParamFileAccepts != null) {
                 paramFileAccepts = mParamFileAccepts.toArray(new String[0][]);
             }
-            return new WebApkInfo.ShareTarget(mAction, mParamTitle, mParamText, null,
+            return new WebApkInfo.ShareTarget(mAction, mParamTitle, mParamText,
                     ShareTarget.METHOD_POST.equalsIgnoreCase(mMethod),
                     ShareTarget.ENCODING_TYPE_MULTIPART.equalsIgnoreCase(mEncodingType),
                     paramFileNames, paramFileAccepts);

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java

@@ -131,11 +131,10 @@ public class WebApkUpdateManagerUnitTest {
                 Bitmap badgeIcon, String[] iconUrls, String[] iconHashes,
                 @WebDisplayMode int displayMode, int orientation, long themeColor,
                 long backgroundColor, String shareTargetAction, String shareTargetParamTitle,
-                String shareTargetParamText, String shareTargetParamUrl,
-                boolean shareTargetParamIsMethodPost, boolean shareTargetParamIsEncTypeMultipart,
-                String[] shareTargetParamFileNames, Object[] shareTargetParamAccepts,
-                String manifestUrl, String webApkPackage, int webApkVersion,
-                boolean isManifestStale, @WebApkUpdateReason int updateReason,
+                String shareTargetParamText, boolean shareTargetParamIsMethodPost,
+                boolean shareTargetParamIsEncTypeMultipart, String[] shareTargetParamFileNames,
+                Object[] shareTargetParamAccepts, String manifestUrl, String webApkPackage,
+                int webApkVersion, boolean isManifestStale, @WebApkUpdateReason int updateReason,
                 Callback<Boolean> callback) {}
 
         @Override
@@ -372,7 +371,7 @@ public class WebApkUpdateManagerUnitTest {
                 manifestData.startUrl, WebApkDistributor.BROWSER,
                 manifestData.iconUrlToMurmur2HashMap,
                 new WebApkInfo.ShareTarget(manifestData.shareTargetAction,
-                        manifestData.shareTargetParamTitle, null, null,
+                        manifestData.shareTargetParamTitle, null,
                         manifestData.shareTargetMethod != null
                                 && manifestData.shareTargetMethod.equals(SHARE_TARGET_METHOD_POST),
                         manifestData.shareTargetEncType != null

chrome/android/webapk/libs/common/src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java

@@ -40,7 +40,6 @@ public final class WebApkMetaDataKeys {
     public static final String SHARE_ENCTYPE = "org.chromium.webapk.shell_apk.shareEnctype";
     public static final String SHARE_PARAM_TITLE = "org.chromium.webapk.shell_apk.shareParamTitle";
     public static final String SHARE_PARAM_TEXT = "org.chromium.webapk.shell_apk.shareParamText";
-    public static final String SHARE_PARAM_URL = "org.chromium.webapk.shell_apk.shareParamUrl";
     public static final String SHARE_PARAM_NAMES = "org.chromium.webapk.shell_apk.shareParamNames";
     public static final String SHARE_PARAM_ACCEPTS =
             "org.chromium.webapk.shell_apk.shareParamAccepts";

chrome/android/webapk/shell_apk/current_version/current_version.gni

@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 112
+current_shell_apk_version = 113

chrome/browser/android/webapk/webapk_installer.cc

@@ -236,8 +236,6 @@ std::unique_ptr<std::string> BuildProtoInBackground(
         base::UTF16ToUTF8(shortcut_info.share_target->params.title));
     share_target_params->set_text(
         base::UTF16ToUTF8(shortcut_info.share_target->params.text));
-    share_target_params->set_url(
-        base::UTF16ToUTF8(shortcut_info.share_target->params.url));
 
     for (const ShareTargetParamsFile& share_target_params_file :
          shortcut_info.share_target->params.files) {

chrome/browser/android/webapk/webapk_update_data_fetcher.cc

@@ -244,8 +244,6 @@ void WebApkUpdateDataFetcher::OnDataAvailable(
         env, info_.share_target->params.title);
     java_share_params_text = base::android::ConvertUTF16ToJavaString(
         env, info_.share_target->params.text);
-    java_share_params_url = base::android::ConvertUTF16ToJavaString(
-        env, info_.share_target->params.url);
 
     java_share_params_is_method_post =
         (info_.share_target->method ==
@@ -274,7 +272,7 @@ void WebApkUpdateDataFetcher::OnDataAvailable(
       static_cast<int>(info_.display), info_.orientation,
       OptionalSkColorToJavaColor(info_.theme_color),
       OptionalSkColorToJavaColor(info_.background_color), java_share_action,
-      java_share_params_title, java_share_params_text, java_share_params_url,
+      java_share_params_title, java_share_params_text,
       java_share_params_is_method_post, java_share_params_is_enctype_multipart,
       java_share_params_file_names, java_share_params_accepts);
 }

chrome/browser/android/webapk/webapk_update_manager.cc

@@ -66,7 +66,6 @@ static void JNI_WebApkUpdateManager_StoreWebApkUpdateRequestToFile(
     const JavaParamRef<jstring>& java_share_target_action,
     const JavaParamRef<jstring>& java_share_target_param_title,
     const JavaParamRef<jstring>& java_share_target_param_text,
-    const JavaParamRef<jstring>& java_share_target_param_url,
     const jboolean java_share_target_param_is_method_post,
     const jboolean java_share_target_param_is_enctype_multipart,
     const JavaParamRef<jobjectArray>& java_share_target_param_file_names,
@@ -107,8 +106,6 @@ static void JNI_WebApkUpdateManager_StoreWebApkUpdateRequestToFile(
         ConvertJavaStringToUTF16(java_share_target_param_title);
     info.share_target->params.text =
         ConvertJavaStringToUTF16(java_share_target_param_text);
-    info.share_target->params.url =
-        ConvertJavaStringToUTF16(java_share_target_param_url);
     info.share_target->method =
         java_share_target_param_is_method_post == JNI_TRUE
             ? blink::Manifest::ShareTarget::Method::kPost