[SharingHub] Update CopyLink button to use ShareParams.getUrl().

Currently uses the current tab, which is inaccurate in some cases (WebShare API, press and hold link share).

Bug: 1079467
Change-Id: I76d651c2f3791a7e3274a0a316409e0a39700099
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225465
Commit-Queue: Sophey Dong <sophey@chromium.org>
Reviewed-by: Kyle Milka <kmilka@chromium.org>
Reviewed-by: Tanya Gupta <tgupta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774900}

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

@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController.SheetState;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver;
 import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver;
+import org.chromium.components.browser_ui.share.ShareParams;
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.printing.PrintingControllerImpl;
@@ -55,6 +56,7 @@ class ChromeProvidedSharingOptionsProvider {
     private final BottomSheetController mBottomSheetController;
     private final ShareSheetBottomSheetContent mBottomSheetContent;
     private final PrefServiceBridge mPrefServiceBridge;
+    private final ShareParams mShareParams;
     private final long mShareStartTime;
     private ScreenshotCoordinator mScreenshotCoordinator;
     private Map<Integer, Set<Integer>> mSharingOptionToContentTypes;
@@ -65,21 +67,23 @@ class ChromeProvidedSharingOptionsProvider {
      * @param activity              The current {@link Activity}.
      * @param tabProvider           Supplier for the current activity tab.
      * @param bottomSheetController The {@link BottomSheetController} for the current activity.
-     * @param bottomSheetContent    The {@link ShareSheetBottomSheetContent} for the current
-     *                              activity.
-     * @param prefServiceBridge     The {@link PrefServiceBridge} singleton. This provides printing
-     *                              preferences.
-     * @param shareStartTime        The start time of the current share.
+     * @param bottomSheetContent The {@link ShareSheetBottomSheetContent} for the current
+     * activity.
+     * @param prefServiceBridge The {@link PrefServiceBridge} singleton. This provides printing
+     * preferences.
+     * @param shareParams The {@link ShareParams} for the current share.
+     * @param shareStartTime The start time of the current share.
      */
     ChromeProvidedSharingOptionsProvider(Activity activity, Supplier<Tab> tabProvider,
             BottomSheetController bottomSheetController,
             ShareSheetBottomSheetContent bottomSheetContent, PrefServiceBridge prefServiceBridge,
-            long shareStartTime) {
+            ShareParams shareParams, long shareStartTime) {
         mActivity = activity;
         mTabProvider = tabProvider;
         mBottomSheetController = bottomSheetController;
         mBottomSheetContent = bottomSheetContent;
         mPrefServiceBridge = prefServiceBridge;
+        mShareParams = shareParams;
         mShareStartTime = shareStartTime;
         mSharingOptionToContentTypes = createSharingOptionToContentTypesMap();
     }
@@ -186,19 +190,10 @@ class ChromeProvidedSharingOptionsProvider {
                             "Sharing.SharingHubAndroid.TimeToShare",
                             System.currentTimeMillis() - mShareStartTime);
                     mBottomSheetController.hideContent(mBottomSheetContent, true);
-                    Tab tab = mTabProvider.get();
-                    String title = tab.getWebContents()
-                                           .getNavigationController()
-                                           .getVisibleEntry()
-                                           .getTitle();
-                    String url = tab.getWebContents()
-                                         .getNavigationController()
-                                         .getVisibleEntry()
-                                         .getUrl();
                     ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(
                             Context.CLIPBOARD_SERVICE);
-                    ClipData clip = ClipData.newPlainText(title, url);
-                    clipboard.setPrimaryClip(clip);
+                    clipboard.setPrimaryClip(
+                            ClipData.newPlainText(mShareParams.getTitle(), mShareParams.getUrl()));
                     Toast toast =
                             Toast.makeText(mActivity, R.string.link_copied, Toast.LENGTH_SHORT);
                     toast.show();

chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java

@@ -65,7 +65,8 @@ class ShareSheetCoordinator {
         ShareSheetBottomSheetContent bottomSheet = new ShareSheetBottomSheetContent(activity);
 
         mShareStartTime = shareStartTime;
-        List<PropertyModel> chromeFeatures = createTopRowPropertyModels(bottomSheet, activity);
+        List<PropertyModel> chromeFeatures =
+                createTopRowPropertyModels(bottomSheet, activity, params);
         List<PropertyModel> thirdPartyApps =
                 createBottomRowPropertyModels(bottomSheet, activity, params, saveLastUsed);
 
@@ -87,13 +88,14 @@ class ShareSheetCoordinator {
     }
 
     List<PropertyModel> createTopRowPropertyModels(
-            ShareSheetBottomSheetContent bottomSheet, Activity activity) {
+            ShareSheetBottomSheetContent bottomSheet, Activity activity, ShareParams shareParams) {
         if (mExcludeFirstParty) {
             return new ArrayList<>();
         }
         ChromeProvidedSharingOptionsProvider chromeProvidedSharingOptionsProvider =
                 new ChromeProvidedSharingOptionsProvider(activity, mTabProvider,
-                        mBottomSheetController, bottomSheet, mPrefServiceBridge, mShareStartTime);
+                        mBottomSheetController, bottomSheet, mPrefServiceBridge, shareParams,
+                        mShareStartTime);
         return chromeProvidedSharingOptionsProvider.createPropertyModels(new HashSet<>(
                 Arrays.asList(ContentType.LINK_PAGE_VISIBLE, ContentType.LINK_PAGE_NOT_VISIBLE,
                         ContentType.TEXT, ContentType.IMAGE, ContentType.OTHER_FILE_TYPE)));

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

@@ -65,7 +65,7 @@ public class ChromeProvidedSharingOptionsProviderTest {
         mChromeProvidedSharingOptionsProvider = new ChromeProvidedSharingOptionsProvider(mActivity,
                 /*activityTabProvider=*/null, /*bottomSheetController=*/null,
                 new ShareSheetBottomSheetContent(mActivity), mPrefServiceBridge,
-                /*shareStartTime=*/0);
+                /*shareParams=*/null, /*shareStartTime=*/0);
 
         // Return false to indicate printing is disabled.
         Mockito.when(mPrefServiceBridge.getBoolean(anyInt())).thenReturn(false);

chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareSheetCoordinatorTest.java

@@ -84,7 +84,7 @@ public final class ShareSheetCoordinatorTest {
         ShareSheetBottomSheetContent bottomSheet = new ShareSheetBottomSheetContent(activity);
 
         List<PropertyModel> propertyModels =
-                coordinator.createTopRowPropertyModels(bottomSheet, activity);
+                coordinator.createTopRowPropertyModels(bottomSheet, activity, /*shareParams=*/null);
         Assert.assertEquals("Property model list should be empty.", 0, propertyModels.size());
     }