Make cancelling a webshare request more reliable.

When triggering a share intent chooser, use startActivityForResult as it
allows Chrome to receive a callback when the activity finishes and can
propagate the cancel much sooner.

This required swapping out Activity for WindowAndroid in the share API,
so it is largely a mechanical swap in the various places triggering share.

BUG=636274

Change-Id: Id3628e65757ca54713a57eefcd47efec24fc65a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832589Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708050}

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -539,7 +539,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
         } else if (itemId == R.id.contextmenu_share_link) {
             ContextMenuUma.record(params, ContextMenuUma.Action.SHARE_LINK);
             ShareParams linkShareParams =
-                    new ShareParams.Builder(helper.getActivity(), params.getUrl(), params.getUrl())
+                    new ShareParams.Builder(helper.getWindow(), params.getUrl(), params.getUrl())
                             .setShareDirectly(false)
                             .setSaveLastUsed(true)
                             .build();

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

@@ -47,6 +47,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
 
     private ContextMenuPopulator mPopulator;
     private ContextMenuParams mCurrentContextMenuParams;
+    private WindowAndroid mWindow;
     private Activity mActivity;
     private Callback<Integer> mCallback;
     private Runnable mOnMenuShown;
@@ -93,6 +94,13 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
         return mActivity;
     }
 
+    /**
+     * @return The window associated with the context menu helper.
+     */
+    protected WindowAndroid getWindow() {
+        return mWindow;
+    }
+
     /**
      * @param populator A {@link ContextMenuPopulator} that is responsible for managing and showing
      *                  context menus.
@@ -122,6 +130,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
         }
 
         mCurrentContextMenuParams = params;
+        mWindow = windowAndroid;
         mActivity = windowAndroid.getActivity().get();
         mCallback = (result) -> {
             mSelectedItemBeforeDismiss = true;
@@ -152,7 +161,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
             final RevampedContextMenuCoordinator menuCoordinator =
                     new RevampedContextMenuCoordinator(
                             topContentOffsetPx, this::shareImageWithLastShareComponent);
-            menuCoordinator.displayMenu(mActivity, mCurrentContextMenuParams, items, mCallback,
+            menuCoordinator.displayMenu(mWindow, mCurrentContextMenuParams, items, mCallback,
                     mOnMenuShown, mOnMenuClosed);
             if (sRevampedContextMenuShownCallback != null) {
                 sRevampedContextMenuShownCallback.onResult(menuCoordinator);
@@ -207,7 +216,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
      */
     public void searchWithGoogleLens(boolean isIncognito) {
         retrieveImage((Uri imageUri) -> {
-            ShareHelper.shareImageWithGoogleLens(mActivity, imageUri, isIncognito);
+            ShareHelper.shareImageWithGoogleLens(mWindow, imageUri, isIncognito);
         });
     }
 
@@ -225,7 +234,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
      * it will use the right activity set when the menu was displayed.
      */
     void shareImage() {
-        retrieveImage((Uri imageUri) -> { ShareHelper.shareImage(mActivity, null, imageUri); });
+        retrieveImage((Uri imageUri) -> { ShareHelper.shareImage(mWindow, null, imageUri); });
     }
 
     /**
@@ -233,8 +242,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
      */
     private void shareImageWithLastShareComponent() {
         retrieveImage((Uri imageUri) -> {
-            ShareHelper.shareImage(
-                    mActivity, ShareHelper.getLastShareComponentName(null), imageUri);
+            ShareHelper.shareImage(mWindow, ShareHelper.getLastShareComponentName(null), imageUri);
         });
     }
 
@@ -290,8 +298,8 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
             return;
         }
         ContextMenuUi menuUi = new PlatformContextMenuUi(menu);
-        menuUi.displayMenu(mActivity, mCurrentContextMenuParams, items, mCallback, mOnMenuShown,
-                mOnMenuClosed);
+        menuUi.displayMenu(
+                mWindow, mCurrentContextMenuParams, items, mCallback, mOnMenuShown, mOnMenuClosed);
     }
 
     private void recordTimeToTakeActionHistogram(boolean selectedItem) {

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java

@@ -4,10 +4,10 @@
 
 package org.chromium.chrome.browser.contextmenu;
 
-import android.app.Activity;
 import android.util.Pair;
 
 import org.chromium.base.Callback;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.util.List;
 
@@ -18,7 +18,7 @@ import java.util.List;
 public interface ContextMenuUi {
     /**
      * Shows the Context Menu in Chrome.
-     * @param activity Used to inflate the context menu.
+     * @param window Used to inflate the context menu.
      * @param params The current parameters for the the context menu.
      * @param items The list of items that need to be displayed in the context menu items. This is
      *              taken from the return value of {@link ContextMenuPopulator#buildContextMenu(
@@ -32,7 +32,7 @@ public interface ContextMenuUi {
      *                     clean up. Boolean here should be true if the menu is closed as a result
      *                     of clicking an item and false if the menu is abandoned by the user.
      */
-    void displayMenu(Activity activity, ContextMenuParams params,
+    void displayMenu(WindowAndroid window, ContextMenuParams params,
             List<Pair<Integer, List<ContextMenuItem>>> items, Callback<Integer> onItemClicked,
             Runnable onMenuShown, Callback<Boolean> onMenuClosed);
 }

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/PlatformContextMenuUi.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.contextmenu;
 
-import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Pair;
@@ -12,6 +11,7 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 
 import org.chromium.base.Callback;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.util.List;
 
@@ -27,12 +27,13 @@ public class PlatformContextMenuUi implements ContextMenuUi {
     }
 
     @Override
-    public void displayMenu(Activity activity, ContextMenuParams params,
+    public void displayMenu(WindowAndroid window, ContextMenuParams params,
             List<Pair<Integer, List<ContextMenuItem>>> itemGroups, final Callback<Integer> listener,
             Runnable onMenuShown, Callback<Boolean> onMenuClosed) {
+        Context context = window.getContext().get();
         String headerText = ChromeContextMenuPopulator.createHeaderText(params);
         if (!TextUtils.isEmpty(headerText)) {
-            setHeaderText(activity, mMenu, headerText);
+            setHeaderText(context, mMenu, headerText);
         }
 
         MenuItem.OnMenuItemClickListener menuListener = new MenuItem.OnMenuItemClickListener() {
@@ -46,7 +47,7 @@ public class PlatformContextMenuUi implements ContextMenuUi {
             List<ContextMenuItem> group = itemGroups.get(groupIndex).second;
             for (int itemIndex = 0; itemIndex < group.size(); itemIndex++) {
                 ContextMenuItem item = group.get(itemIndex);
-                MenuItem menuItem = mMenu.add(0, item.getMenuId(), 0, item.getTitle(activity));
+                MenuItem menuItem = mMenu.add(0, item.getMenuId(), 0, item.getTitle(context));
                 menuItem.setOnMenuItemClickListener(menuListener);
             }
         }

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinator.java

@@ -20,6 +20,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.share.ShareParams;
 import org.chromium.chrome.browser.ui.widget.ContextMenuDialog;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 import org.chromium.ui.modelutil.ModelListAdapter;
@@ -66,10 +67,11 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
     }
 
     @Override
-    public void displayMenu(final Activity activity, ContextMenuParams params,
+    public void displayMenu(final WindowAndroid window, ContextMenuParams params,
             List<Pair<Integer, List<ContextMenuItem>>> items, Callback<Integer> onItemClicked,
             final Runnable onMenuShown, final Callback<Boolean> onMenuClosed) {
         mOnMenuClosed = onMenuClosed;
+        Activity activity = window.getActivity().get();
         final float density = activity.getResources().getDisplayMetrics().density;
         final float touchPointXPx = params.getTriggeringTouchXDp() * density;
         final float touchPointYPx = params.getTriggeringTouchYDp() * density;
@@ -83,7 +85,7 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
         mHeaderCoordinator = new RevampedContextMenuHeaderCoordinator(activity, params);
 
         // The Integer here specifies the {@link ListItemType}.
-        ModelList listItems = getItemList(activity, items, params);
+        ModelList listItems = getItemList(window, items, params);
 
         ModelListAdapter adapter = new ModelListAdapter(listItems) {
             @Override
@@ -167,8 +169,9 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
     }
 
     @VisibleForTesting
-    ModelList getItemList(Activity activity, List<Pair<Integer, List<ContextMenuItem>>> items,
+    ModelList getItemList(WindowAndroid window, List<Pair<Integer, List<ContextMenuItem>>> items,
             ContextMenuParams params) {
+        Activity activity = window.getActivity().get();
         ModelList itemList = new ModelList();
 
         // TODO(sinansahin): We should be able to remove this conversion once we can get the items
@@ -196,7 +199,7 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
                                     .with(RevampedContextMenuShareItemProperties.CONTENT_DESC,
                                             shareInfo.second)
                                     .with(RevampedContextMenuShareItemProperties.CLICK_LISTENER,
-                                            getShareItemClickListener(activity, shareItem, params))
+                                            getShareItemClickListener(window, shareItem, params))
                                     .build();
                     itemList.add(new ListItem(ListItemType.CONTEXT_MENU_SHARE_ITEM, itemModel));
                 } else {
@@ -216,7 +219,7 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
     }
 
     private View.OnClickListener getShareItemClickListener(
-            Activity activity, ShareContextMenuItem item, ContextMenuParams params) {
+            WindowAndroid window, ShareContextMenuItem item, ContextMenuParams params) {
         return (v) -> {
             ChromeContextMenuPopulator.ContextMenuUma.record(params,
                     item.isShareLink()
@@ -226,7 +229,7 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
             mDialog.dismiss();
             if (item.isShareLink()) {
                 final ShareParams shareParams =
-                        new ShareParams.Builder(activity, params.getUrl(), params.getUrl())
+                        new ShareParams.Builder(window, params.getUrl(), params.getUrl())
                                 .setShareDirectly(true)
                                 .setSaveLastUsed(false)
                                 .build();

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/GetPagesByNamespaceForLivePageSharingCallback.java

@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser.offlinepages;
 
-import android.app.Activity;
-
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.share.ShareParams;
 import org.chromium.chrome.browser.tab.Tab;
@@ -19,14 +17,12 @@ import java.util.List;
  */
 public class GetPagesByNamespaceForLivePageSharingCallback
         implements Callback<List<OfflinePageItem>> {
-    private Activity mActivity;
     private Tab mTab;
     private Callback<ShareParams> mShareCallback;
     private OfflinePageBridge mBridge;
 
-    public GetPagesByNamespaceForLivePageSharingCallback(Activity activity, Tab tab,
-            final Callback<ShareParams> shareCallback, OfflinePageBridge bridge) {
-        mActivity = activity;
+    public GetPagesByNamespaceForLivePageSharingCallback(
+            Tab tab, final Callback<ShareParams> shareCallback, OfflinePageBridge bridge) {
         mTab = tab;
         mShareCallback = shareCallback;
         mBridge = bridge;
@@ -38,7 +34,7 @@ public class GetPagesByNamespaceForLivePageSharingCallback
         // it directly.
         for (OfflinePageItem item : items) {
             if (item.getUrl().equals(mTab.getUrl())) {
-                OfflinePageUtils.sharePublishedPage(item, mActivity, mShareCallback);
+                OfflinePageUtils.sharePublishedPage(item, mTab.getWindowAndroid(), mShareCallback);
                 return;
             }
         }
@@ -47,6 +43,6 @@ public class GetPagesByNamespaceForLivePageSharingCallback
         mBridge.savePage(mTab.getWebContents(),
                 new ClientId(OfflinePageBridge.LIVE_PAGE_SHARING_NAMESPACE,
                         Integer.toString(mTab.getId())),
-                new SavePageAndShareCallback(mActivity, mShareCallback, mBridge));
+                new SavePageAndShareCallback(mTab.getWindowAndroid(), mShareCallback, mBridge));
     }
 }
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/PublishPageCallback.java

@@ -4,11 +4,10 @@
 
 package org.chromium.chrome.browser.offlinepages;
 
-import android.app.Activity;
-
 import org.chromium.base.Callback;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.share.ShareParams;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * This callback will save the state we need when the JNI call is done, and start the next stage of
@@ -17,13 +16,13 @@ import org.chromium.chrome.browser.share.ShareParams;
 public class PublishPageCallback implements Callback<String> {
     private Callback<ShareParams> mShareCallback;
     OfflinePageItem mPage;
-    private Activity mActivity;
+    private WindowAndroid mWindow;
     private static final String TAG = "PublishPageCallback";
 
     /** Create a callback for use when page publishing is completed. */
     public PublishPageCallback(
-            Activity activity, OfflinePageItem page, Callback<ShareParams> shareCallback) {
-        mActivity = activity;
+            WindowAndroid window, OfflinePageItem page, Callback<ShareParams> shareCallback) {
+        mWindow = window;
         mPage = page;
         mShareCallback = shareCallback;
     }
@@ -43,6 +42,6 @@ public class PublishPageCallback implements Callback<String> {
                     mPage.getAccessCount(), mPage.getLastAccessTimeMs(), mPage.getRequestOrigin());
         }
 
-        OfflinePageUtils.publishCompleted(page, mActivity, mShareCallback);
+        OfflinePageUtils.publishCompleted(page, mWindow, mShareCallback);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/SavePageAndShareCallback.java

@@ -4,24 +4,23 @@
 
 package org.chromium.chrome.browser.offlinepages;
 
-import android.app.Activity;
-
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.share.ShareParams;
 import org.chromium.components.offlinepages.SavePageResult;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * This callback will save get the saved page during live page sharing and share the page if saving
  * process succeeds.
  */
 public class SavePageAndShareCallback implements OfflinePageBridge.SavePageCallback {
-    private Activity mActivity;
+    private WindowAndroid mWindow;
     private Callback<ShareParams> mShareCallback;
     private OfflinePageBridge mBridge;
 
-    public SavePageAndShareCallback(Activity activity, final Callback<ShareParams> shareCallback,
+    public SavePageAndShareCallback(WindowAndroid window, final Callback<ShareParams> shareCallback,
             OfflinePageBridge bridge) {
-        mActivity = activity;
+        mWindow = window;
         mShareCallback = shareCallback;
         mBridge = bridge;
     }
@@ -35,7 +34,7 @@ public class SavePageAndShareCallback implements OfflinePageBridge.SavePageCallb
         mBridge.getPageByOfflineId(offlineId, new Callback<OfflinePageItem>() {
             @Override
             public void onResult(OfflinePageItem page) {
-                OfflinePageUtils.sharePublishedPage(page, mActivity, mShareCallback);
+                OfflinePageUtils.sharePublishedPage(page, mWindow, mShareCallback);
             }
         });
     }

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

@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.components.ui_metrics.CanonicalURLResult;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.GURLUtils;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,12 +87,11 @@ public class ShareMenuActionHandler {
 
         if (!classesToEnable.isEmpty()) {
             OptionalShareTargetsManager.getInstance().enableOptionalShareActivities(activity,
-                    classesToEnable,
-                    () -> triggerShare(activity, currentTab, shareDirectly, isIncognito));
+                    classesToEnable, () -> triggerShare(currentTab, shareDirectly, isIncognito));
             return;
         }
 
-        triggerShare(activity, currentTab, shareDirectly, isIncognito);
+        triggerShare(currentTab, shareDirectly, isIncognito);
     }
 
     @VisibleForTesting
@@ -154,18 +154,19 @@ public class ShareMenuActionHandler {
         }
     }
 
-    private void triggerShare(final Activity activity, final Tab currentTab,
-            final boolean shareDirectly, boolean isIncognito) {
+    private void triggerShare(
+            final Tab currentTab, final boolean shareDirectly, boolean isIncognito) {
         ScreenshotTabObserver tabObserver = ScreenshotTabObserver.from(currentTab);
         if (tabObserver != null) {
             tabObserver.onActionPerformedAfterScreenshot(
                     ScreenshotTabObserver.SCREENSHOT_ACTION_SHARE);
         }
 
-        OfflinePageUtils.maybeShareOfflinePage(activity, currentTab, (ShareParams p) -> {
+        OfflinePageUtils.maybeShareOfflinePage(currentTab, (ShareParams p) -> {
             if (p != null) {
                 mDelegate.share(p);
             } else {
+                WindowAndroid window = currentTab.getWindowAndroid();
                 // Could not share as an offline page.
                 if (shouldFetchCanonicalUrl(currentTab)) {
                     WebContents webContents = currentTab.getWebContents();
@@ -176,12 +177,12 @@ public class ShareMenuActionHandler {
                         public void onResult(String result) {
                             logCanonicalUrlResult(visibleUrl, result);
 
-                            triggerShareWithCanonicalUrlResolved(activity, webContents, title,
+                            triggerShareWithCanonicalUrlResolved(window, webContents, title,
                                     visibleUrl, result, shareDirectly, isIncognito);
                         }
                     });
                 } else {
-                    triggerShareWithCanonicalUrlResolved(activity, currentTab.getWebContents(),
+                    triggerShareWithCanonicalUrlResolved(window, currentTab.getWebContents(),
                             currentTab.getTitle(), currentTab.getUrl(), null, shareDirectly,
                             isIncognito);
                 }
@@ -189,17 +190,16 @@ public class ShareMenuActionHandler {
         });
     }
 
-    private void triggerShareWithCanonicalUrlResolved(final Activity mainActivity,
+    private void triggerShareWithCanonicalUrlResolved(final WindowAndroid window,
             final WebContents webContents, final String title, final String visibleUrl,
             final String canonicalUrl, final boolean shareDirectly, boolean isIncognito) {
         // Share an empty blockingUri in place of screenshot file. The file ready notification is
         // sent by onScreenshotReady call below when the file is written.
         final Uri blockingUri = (isIncognito || webContents == null)
                 ? null
-                : ChromeFileProvider.generateUriAndBlockAccess(mainActivity);
+                : ChromeFileProvider.generateUriAndBlockAccess();
         ShareParams.Builder builder =
-                new ShareParams
-                        .Builder(mainActivity, title, getUrlToShare(visibleUrl, canonicalUrl))
+                new ShareParams.Builder(window, title, getUrlToShare(visibleUrl, canonicalUrl))
                         .setShareDirectly(shareDirectly)
                         .setSaveLastUsed(!shareDirectly)
                         .setScreenshotUri(blockingUri);

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

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.share;
 
-import android.app.Activity;
 import android.net.Uri;
 import android.text.TextUtils;
 
@@ -13,6 +12,7 @@ import androidx.annotation.Nullable;
 
 import org.chromium.chrome.browser.share.ShareHelper.TargetChosenCallback;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.util.ArrayList;
 
@@ -29,8 +29,8 @@ public class ShareParams {
     /** Whether to save the chosen activity for future direct sharing. */
     private final boolean mSaveLastUsed;
 
-    /** The activity that is used to access package manager. */
-    private final Activity mActivity;
+    /** The window that triggered the share action. */
+    private final WindowAndroid mWindow;
 
     /** The title of the page to be shared. */
     private final String mTitle;
@@ -69,14 +69,14 @@ public class ShareParams {
     @Nullable
     private final Runnable mOnDialogDismissed;
 
-    private ShareParams(boolean shareDirectly, boolean saveLastUsed, Activity activity,
+    private ShareParams(boolean shareDirectly, boolean saveLastUsed, WindowAndroid window,
             String title, String text, String url, @Nullable String fileContentType,
             @Nullable ArrayList<Uri> fileUris, @Nullable Uri offlineUri,
             @Nullable Uri screenshotUri, @Nullable TargetChosenCallback callback,
             @Nullable String sourcePackageName, @Nullable Runnable onDialogDismissed) {
         mShareDirectly = shareDirectly;
         mSaveLastUsed = saveLastUsed;
-        mActivity = activity;
+        mWindow = window;
         mTitle = title;
         mText = text;
         mUrl = url;
@@ -105,10 +105,10 @@ public class ShareParams {
     }
 
     /**
-     * @return The activity that is used to access package manager.
+     * @return The window that triggered share.
      */
-    public Activity getActivity() {
-        return mActivity;
+    public WindowAndroid getWindow() {
+        return mWindow;
     }
 
     /**
@@ -191,7 +191,7 @@ public class ShareParams {
     public static class Builder {
         private boolean mShareDirectly;
         private boolean mSaveLastUsed;
-        private Activity mActivity;
+        private WindowAndroid mWindow;
         private String mTitle;
         private String mText;
         private String mUrl;
@@ -204,8 +204,8 @@ public class ShareParams {
         private boolean mIsExternalUrl;
         private Runnable mOnDialogDismissed;
 
-        public Builder(@NonNull Activity activity, @NonNull String title, @NonNull String url) {
-            mActivity = activity;
+        public Builder(@NonNull WindowAndroid window, @NonNull String title, @NonNull String url) {
+            mWindow = window;
             mUrl = url;
             mTitle = title;
         }
@@ -320,7 +320,7 @@ public class ShareParams {
                     mText = mUrl;
                 }
             }
-            return new ShareParams(mShareDirectly, mSaveLastUsed, mActivity, mTitle, mText, mUrl,
+            return new ShareParams(mShareDirectly, mSaveLastUsed, mWindow, mTitle, mText, mUrl,
                     mFileContentType, mFileUris, mOfflineUri, mScreenshotUri, mCallback,
                     mSourcePackageName, mOnDialogDismissed);
         }

chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.Set;
  * third_party/blink/public/mojom/webshare/webshare.mojom.
  */
 public class ShareServiceImpl implements ShareService {
-    private final Activity mActivity;
+    private final WindowAndroid mWindow;
 
     private static final String TAG = "share";
 
@@ -142,7 +142,7 @@ public class ShareServiceImpl implements ShareService {
             PostTask.createSequencedTaskRunner(TaskTraits.USER_BLOCKING);
 
     public ShareServiceImpl(@Nullable WebContents webContents) {
-        mActivity = activityFromWebContents(webContents);
+        mWindow = webContents.getTopLevelNativeWindow();
     }
 
     @Override
@@ -157,7 +157,7 @@ public class ShareServiceImpl implements ShareService {
         RecordHistogram.recordEnumeratedHistogram("WebShare.ApiCount", WEBSHARE_METHOD_SHARE,
                 WEBSHARE_METHOD_COUNT);
 
-        if (mActivity == null) {
+        if (mWindow.getActivity().get() == null) {
             RecordHistogram.recordEnumeratedHistogram("WebShare.ShareOutcome",
                     WEBSHARE_OUTCOME_UNKNOWN_FAILURE, WEBSHARE_OUTCOME_COUNT);
             callback.call(ShareError.INTERNAL_ERROR);
@@ -180,7 +180,7 @@ public class ShareServiceImpl implements ShareService {
             }
         };
 
-        final ShareParams.Builder paramsBuilder = new ShareParams.Builder(mActivity, title, url.url)
+        final ShareParams.Builder paramsBuilder = new ShareParams.Builder(mWindow, title, url.url)
                                                           .setText(text)
                                                           .setCallback(innerCallback);
 

chrome/android/javatests/src/org/chromium/chrome/browser/ShareIntentTest.java

@@ -4,12 +4,14 @@
 
 package org.chromium.chrome.browser;
 
+import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.support.test.filters.LargeTest;
+import android.view.Window;
 
 import org.junit.After;
 import org.junit.Before;
@@ -28,8 +30,10 @@ import org.chromium.chrome.browser.util.ChromeFileProvider;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -66,6 +70,15 @@ public class ShareIntentTest {
          */
         @Override
         public void startActivity(Intent intent) {
+            processStartActivityIntent(intent);
+        }
+
+        @Override
+        public void startActivityForResult(Intent intent, int requestCode) {
+            processStartActivityIntent(intent);
+        }
+
+        private void processStartActivityIntent(Intent intent) {
             final Uri uri = intent.getClipData().getItemAt(0).getUri();
             PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> {
                 ChromeFileProvider provider = new ChromeFileProvider();
@@ -113,6 +126,11 @@ public class ShareIntentTest {
         public PackageManager getPackageManager() {
             return mActivity.getPackageManager();
         }
+
+        @Override
+        public Window getWindow() {
+            return mActivity.getWindow();
+        }
     }
 
     @Test
@@ -121,7 +139,7 @@ public class ShareIntentTest {
     public void testShareIntent() throws ExecutionException, InterruptedException {
         MockChromeActivity mockActivity = TestThreadUtils.runOnUiThreadBlocking(() -> {
             // Sets a test component as last shared and "shareDirectly" option is set so that
-            // the share selector menu is not opened. The start activity is overriden, so the
+            // the share selector menu is not opened. The start activity is overridden, so the
             // package and class names do not matter.
             return new MockChromeActivity(mActivityTestRule.getActivity());
         });
@@ -130,6 +148,17 @@ public class ShareIntentTest {
         // Skips the capture of screenshot and notifies with an empty file.
         ShareMenuActionHandler.setScreenshotCaptureSkippedForTesting(true);
 
+        WindowAndroid window = TestThreadUtils.runOnUiThreadBlocking(() -> {
+            return new WindowAndroid(mActivityTestRule.getActivity()) {
+                @Override
+                public WeakReference<Activity> getActivity() {
+                    return new WeakReference<>(mockActivity);
+                }
+            };
+        });
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mockActivity.getActivityTab().updateWindowAndroid(window); });
+
         TestThreadUtils.runOnUiThreadBlocking(
                 () -> mockActivity.onShareMenuItemSelected(
                                 true /* shareDirectly */, false /* isIncognito */));

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java

@@ -274,7 +274,7 @@ public class OfflinePageUtilsTest {
         final TestShareCallback shareCallback = new TestShareCallback(semaphore);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            OfflinePageUtils.maybeShareOfflinePage(mActivityTestRule.getActivity(),
+            OfflinePageUtils.maybeShareOfflinePage(
                     mActivityTestRule.getActivity().getActivityTab(), shareCallback);
         });
 
@@ -301,7 +301,7 @@ public class OfflinePageUtilsTest {
         final TestShareCallback shareCallback = new TestShareCallback(semaphore);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            OfflinePageUtils.maybeShareOfflinePage(mActivityTestRule.getActivity(),
+            OfflinePageUtils.maybeShareOfflinePage(
                     mActivityTestRule.getActivity().getActivityTab(), shareCallback);
         });
         // Wait for share callback to get called.

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

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.share;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
 import org.junit.Assert;
@@ -18,6 +19,9 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
+import org.chromium.ui.base.WindowAndroid;
+
+import java.lang.ref.WeakReference;
 
 /**
  * Tests sharing URLs in reader mode (DOM distiller)
@@ -32,8 +36,15 @@ public class ShareUrlTest {
 
     private void assertCorrectUrl(final String originalUrl, final String sharedUrl) {
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
-            ShareParams params =
-                    new ShareParams.Builder(new Activity(), "", sharedUrl).setText("").build();
+            Activity activity = new Activity();
+            WindowAndroid window = new WindowAndroid(
+                    InstrumentationRegistry.getInstrumentation().getTargetContext()) {
+                @Override
+                public WeakReference<Activity> getActivity() {
+                    return new WeakReference<>(activity);
+                }
+            };
+            ShareParams params = new ShareParams.Builder(window, "", sharedUrl).setText("").build();
             Intent intent = ShareHelper.getShareLinkIntent(params);
             Assert.assertTrue(intent.hasExtra(Intent.EXTRA_TEXT));
             String url = intent.getStringExtra(Intent.EXTRA_TEXT);

chrome/android/javatests/src/org/chromium/chrome/browser/util/ChromeFileProviderTest.java

@@ -4,10 +4,8 @@
 
 package org.chromium.chrome.browser.util;
 
-import android.content.Context;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.SmallTest;
 
@@ -48,8 +46,7 @@ public class ChromeFileProviderTest {
     @Test
     @SmallTest
     public void testOpenFileWhenReady() {
-        Uri uri =
-                ChromeFileProvider.generateUriAndBlockAccess(InstrumentationRegistry.getContext());
+        Uri uri = ChromeFileProvider.generateUriAndBlockAccess();
         Uri fileUri = new Uri.Builder().path("1").build();
         ChromeFileProvider.notifyFileReady(uri, fileUri);
         Uri result = ChromeFileProvider.getFileUriWhenReady(uri);
@@ -59,8 +56,7 @@ public class ChromeFileProviderTest {
     @Test
     @LargeTest
     public void testOpenOnAsyncNotify() {
-        final Context context = InstrumentationRegistry.getContext();
-        final Uri uri = ChromeFileProvider.generateUriAndBlockAccess(context);
+        final Uri uri = ChromeFileProvider.generateUriAndBlockAccess();
         PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> {
             try {
                 Thread.sleep(10);
@@ -77,9 +73,8 @@ public class ChromeFileProviderTest {
     @Test
     @LargeTest
     public void testFileChanged() {
-        final Context context = InstrumentationRegistry.getContext();
-        Uri uri1 = ChromeFileProvider.generateUriAndBlockAccess(context);
-        final Uri uri2 = ChromeFileProvider.generateUriAndBlockAccess(context);
+        Uri uri1 = ChromeFileProvider.generateUriAndBlockAccess();
+        final Uri uri2 = ChromeFileProvider.generateUriAndBlockAccess();
         final Uri fileUri2 = new Uri.Builder().path("2").build();
         PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> {
             try {

chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinatorTest.java

@@ -21,6 +21,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator.ContextMenuGroup;
 import org.chromium.chrome.browser.contextmenu.RevampedContextMenuCoordinator.ListItemType;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 
 import java.util.ArrayList;
@@ -33,10 +35,12 @@ import java.util.List;
 public class RevampedContextMenuCoordinatorTest {
     private RevampedContextMenuCoordinator mCoordinator;
     private Activity mActivity;
+    private WindowAndroid mWindow;
 
     @Before
     public void setUpTest() {
         mActivity = Robolectric.setupActivity(Activity.class);
+        mWindow = new ActivityWindowAndroid(mActivity, false);
         mCoordinator = new RevampedContextMenuCoordinator(0, null);
     }
 
@@ -62,7 +66,7 @@ public class RevampedContextMenuCoordinatorTest {
         rawItems.add(new Pair<>(ContextMenuGroup.IMAGE, groupTwo));
 
         mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
-        ModelList itemList = mCoordinator.getItemList(mActivity, rawItems, params);
+        ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
 
         assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
         assertThat(itemList.get(1).type, equalTo(ListItemType.DIVIDER));
@@ -95,7 +99,7 @@ public class RevampedContextMenuCoordinatorTest {
         rawItems.add(new Pair<>(ContextMenuGroup.LINK, groupOne));
 
         mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
-        ModelList itemList = mCoordinator.getItemList(mActivity, rawItems, params);
+        ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
 
         assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
         assertThat(itemList.get(1).type, equalTo(ListItemType.DIVIDER));
@@ -116,7 +120,7 @@ public class RevampedContextMenuCoordinatorTest {
         rawItems.add(new Pair<>(ContextMenuGroup.LINK, groupOne));
 
         mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
-        ModelList itemList = mCoordinator.getItemList(mActivity, rawItems, params);
+        ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
 
         assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
         assertThat(itemList.get(1).type, equalTo(ListItemType.DIVIDER));

chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.util;
 
-import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
@@ -12,6 +11,8 @@ import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.support.v4.content.FileProvider;
 
+import org.chromium.base.ContextUtils;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Arrays;
@@ -42,10 +43,9 @@ public class ChromeFileProvider extends FileProvider {
      *
      * This function clobbers any uri that was previously created and the client application
      * accessing those uri will get a null file descriptor.
-     * @param context Activity context that is used to access package manager.
      */
-    public static Uri generateUriAndBlockAccess(final Context context) {
-        String authority = getAuthority(context);
+    public static Uri generateUriAndBlockAccess() {
+        String authority = getAuthority();
         String fileName = BLOCKED_FILE_PREFIX + String.valueOf(System.nanoTime());
         Uri blockingUri = new Uri.Builder()
                                   .scheme(UrlConstants.CONTENT_SCHEME)
@@ -64,13 +64,10 @@ public class ChromeFileProvider extends FileProvider {
 
     /**
      * Returns an unique uri to identify the file to be shared.
-     *
-     * @param context Activity context that is used to access package manager.
      * @param file File for which the Uri is generated.
      */
-    public static Uri generateUri(final Context context, File file)
-            throws IllegalArgumentException {
-        return getUriForFile(context, getAuthority(context), file);
+    public static Uri generateUri(File file) throws IllegalArgumentException {
+        return getUriForFile(ContextUtils.getApplicationContext(), getAuthority(), file);
     }
 
     /**
@@ -184,10 +181,9 @@ public class ChromeFileProvider extends FileProvider {
 
     /**
      * Gets the authority string for content URI generation.
-     * @param context Activity context that is used to access package manager.
      */
-    private static String getAuthority(Context context) {
-        return context.getPackageName() + AUTHORITY_SUFFIX;
+    private static String getAuthority() {
+        return ContextUtils.getApplicationContext().getPackageName() + AUTHORITY_SUFFIX;
     }
 
     private static boolean doesMatchCurrentBlockingUri(Uri uri) {