[SharingHub] Display url in preview without the scheme prefix.

Bug: 1120093, 1129673
Change-Id: I28090ce188f331050c546802a514da33254359a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419382Reviewed-by: Tanya Gupta <tgupta@chromium.org>
Commit-Queue: Sophey Dong <sophey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809211}

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

@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.components.browser_ui.share.ShareParams;
 import org.chromium.components.browser_ui.widget.RoundedIconGenerator;
+import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.ui.modelutil.LayoutViewBuilder;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
@@ -144,7 +145,8 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
     private void createPreview(Set<Integer> contentTypes) {
         // Default preview is to show title + url.
         String title = mParams.getTitle();
-        String subtitle = mParams.getUrl();
+        String subtitle =
+                UrlFormatter.formatUrlForDisplayOmitSchemeOmitTrivialSubdomains(mParams.getUrl());
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB_V15)) {
             fetchFavicon(mParams.getUrl());
             setTitleStyle(R.style.TextAppearance_TextMediumThick_Primary);

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

@@ -35,6 +35,7 @@ import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.browser_ui.share.ShareParams;
+import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.ui.test.util.DummyUiActivity;
 import org.chromium.url.GURL;
 
@@ -58,6 +59,7 @@ public final class ShareSheetBottomSheetContentTest {
     private static final String sText = "Text";
     private static final String sTitle = "Title";
     private static final String sUrl = "https://www.example.com";
+    private String mPreviewUrl;
 
     private Activity mActivity;
     private ShareParams mShareParams;
@@ -66,6 +68,7 @@ public final class ShareSheetBottomSheetContentTest {
     @Before
     public void setUp() {
         mActivity = mActivityTestRule.getActivity();
+        mPreviewUrl = UrlFormatter.formatUrlForDisplayOmitSchemeOmitTrivialSubdomains(sUrl);
         mShareParams = new ShareParams.Builder(/*window=*/null, sTitle, sUrl)
                                .setText(sText)
                                .setFileUris(new ArrayList<>(ImmutableList.of(sImageUri)))
@@ -154,7 +157,7 @@ public final class ShareSheetBottomSheetContentTest {
         ImageView imageView =
                 mShareSheetBottomSheetContent.getContentView().findViewById(R.id.image_preview);
         assertEquals(mShareParams.getTitle(), titleView.getText());
-        assertEquals(mShareParams.getUrl(), subtitleView.getText());
+        assertEquals(mPreviewUrl, subtitleView.getText());
         assertNotNull(imageView.getDrawable());
     }
 
@@ -171,7 +174,7 @@ public final class ShareSheetBottomSheetContentTest {
         ImageView imageView =
                 mShareSheetBottomSheetContent.getContentView().findViewById(R.id.image_preview);
         assertEquals(mShareParams.getText(), titleView.getText());
-        assertEquals(mShareParams.getUrl(), subtitleView.getText());
+        assertEquals(mPreviewUrl, subtitleView.getText());
         assertNotNull(imageView.getDrawable());
     }
 
@@ -192,7 +195,7 @@ public final class ShareSheetBottomSheetContentTest {
         ImageView imageView =
                 shareSheetBottomSheetContent.getContentView().findViewById(R.id.image_preview);
         assertEquals(View.GONE, titleView.getVisibility());
-        assertEquals(mShareParams.getUrl(), subtitleView.getText());
+        assertEquals(mPreviewUrl, subtitleView.getText());
         assertNotNull(imageView.getDrawable());
     }