[SharingHub] Only enable disabled content types for v1.5.

Bug: 1152119
Change-Id: Ifd622c16af140d799f5ccecd35e3d6a420bfee69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2555471Reviewed-by: Tanya Gupta <tgupta@chromium.org>
Commit-Queue: Sophey Dong <sophey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831172}

chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java

@@ -165,7 +165,9 @@ class ChromeProvidedSharingOptionsProvider {
         }
 
         FirstPartyOptionBuilder setContentTypesToDisableFor(Integer... contentTypesToDisableFor) {
-            mContentTypesToDisableFor = contentTypesToDisableFor;
+            if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB_V15)) {
+                mContentTypesToDisableFor = contentTypesToDisableFor;
+            }
             return this;
         }
 

chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProviderTest.java

@@ -116,6 +116,7 @@ public class ChromeProvidedSharingOptionsProviderTest {
 
         assertCorrectModelsAreInTheRightOrder(propertyModels,
                 ImmutableList.of(mActivity.getResources().getString(R.string.sharing_screenshot),
+                        mActivity.getResources().getString(R.string.sharing_copy_url),
                         mActivity.getResources().getString(
                                 R.string.send_tab_to_self_share_activity_title),
                         mActivity.getResources().getString(R.string.qr_code_share_icon_label)));
@@ -133,8 +134,9 @@ public class ChromeProvidedSharingOptionsProviderTest {
                         ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES, /*isMultiWindow=*/false);
 
         assertCorrectModelsAreInTheRightOrder(propertyModels,
-                ImmutableList.of(mActivity.getResources().getString(
-                        R.string.send_tab_to_self_share_activity_title)));
+                ImmutableList.of(mActivity.getResources().getString(R.string.sharing_copy_url),
+                        mActivity.getResources().getString(
+                                R.string.send_tab_to_self_share_activity_title)));
     }
 
     @Test
@@ -149,8 +151,9 @@ public class ChromeProvidedSharingOptionsProviderTest {
                         ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES, /*isMultiWindow=*/false);
 
         assertCorrectModelsAreInTheRightOrder(propertyModels,
-                ImmutableList.of(mActivity.getResources().getString(
-                                         R.string.send_tab_to_self_share_activity_title),
+                ImmutableList.of(mActivity.getResources().getString(R.string.sharing_copy_url),
+                        mActivity.getResources().getString(
+                                R.string.send_tab_to_self_share_activity_title),
                         mActivity.getResources().getString(R.string.print_share_activity_title)));
     }
 
@@ -248,8 +251,9 @@ public class ChromeProvidedSharingOptionsProviderTest {
                         ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES, /*isMultiWindow=*/true);
 
         assertCorrectModelsAreInTheRightOrder(propertyModels,
-                ImmutableList.of(mActivity.getResources().getString(
-                        R.string.send_tab_to_self_share_activity_title)));
+                ImmutableList.of(mActivity.getResources().getString(R.string.sharing_copy_url),
+                        mActivity.getResources().getString(
+                                R.string.send_tab_to_self_share_activity_title)));
     }
 
     @Test