[SharingHub] Changed the way firstPartyOptions are created.

They will not be created on demand. This simplifies the logic to decide
which options are relevant given the current state of the Chrome app.

Change-Id: I9b3ebf3030cfaa48088d7c1d0082d659b47f28cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485838
Commit-Queue: Tanya Gupta <tgupta@chromium.org>
Reviewed-by: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821914}

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

@@ -47,10 +47,6 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
     private final BottomSheetController mBottomSheetController;
     private final Supplier<Tab> mTabProvider;
     private final ShareSheetPropertyModelBuilder mPropertyModelBuilder;
-    private final Callback<Tab> mPrintTabCallback;
-    private final SettingsLauncher mSettingsLauncher;
-    private final boolean mIsSyncEnabled;
-    private long mShareStartTime;
     private boolean mExcludeFirstParty;
     private boolean mIsMultiWindow;
     private Set<Integer> mContentTypes;
@@ -82,9 +78,6 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
         mLifecycleDispatcher.register(this);
         mTabProvider = tabProvider;
         mPropertyModelBuilder = modelBuilder;
-        mPrintTabCallback = printTab;
-        mSettingsLauncher = settingsLauncher;
-        mIsSyncEnabled = isSyncEnabled;
         mBottomSheetObserver = new EmptyBottomSheetObserver() {
             @Override
             public void onSheetContentChanged(BottomSheetContent bottomSheet) {
@@ -100,6 +93,11 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
         };
         mBottomSheetController.addObserver(mBottomSheetObserver);
         mIconBridge = iconBridge;
+
+        mChromeProvidedSharingOptionsProvider =
+                new ChromeProvidedSharingOptionsProvider(tabProvider, controller, mBottomSheet);
+        mChromeProvidedSharingOptionsProvider.setFeatureSpecificParams(
+                printTab, settingsLauncher, isSyncEnabled);
     }
 
     protected void destroy() {
@@ -117,6 +115,7 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
             mLifecycleDispatcher.unregister(this);
             mLifecycleDispatcher = null;
         }
+        mChromeProvidedSharingOptionsProvider = null;
     }
 
     // TODO(crbug/1022172): Should be package-protected once modularization is complete.
@@ -135,12 +134,11 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
 
         mBottomSheet = new ShareSheetBottomSheetContent(mActivity, mIconBridge, this, params);
 
-        mShareStartTime = shareStartTime;
         mContentTypes = ShareSheetPropertyModelBuilder.getContentTypes(params, chromeShareExtras);
-        List<PropertyModel> firstPartyApps =
-                createFirstPartyPropertyModels(mActivity, params, chromeShareExtras, mContentTypes);
+        List<PropertyModel> firstPartyApps = createFirstPartyPropertyModels(
+                mActivity, params, chromeShareExtras, mContentTypes, shareStartTime);
         List<PropertyModel> thirdPartyApps = createThirdPartyPropertyModels(
-                mActivity, params, mContentTypes, chromeShareExtras.saveLastUsed());
+                mActivity, params, mContentTypes, chromeShareExtras.saveLastUsed(), shareStartTime);
 
         mBottomSheet.createRecyclerViews(
                 firstPartyApps, thirdPartyApps, mContentTypes, params.getFileContentType());
@@ -162,25 +160,24 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
     }
 
     List<PropertyModel> createFirstPartyPropertyModels(Activity activity, ShareParams shareParams,
-            ChromeShareExtras chromeShareExtras, Set<Integer> contentTypes) {
+            ChromeShareExtras chromeShareExtras, Set<Integer> contentTypes, long shareStartTime) {
         if (mExcludeFirstParty) {
             return new ArrayList<>();
         }
-        mChromeProvidedSharingOptionsProvider = new ChromeProvidedSharingOptionsProvider(activity,
-                mTabProvider, mBottomSheetController, mBottomSheet, shareParams, chromeShareExtras,
-                mPrintTabCallback, mSettingsLauncher, mIsSyncEnabled, mShareStartTime, this);
         mIsMultiWindow = ApiCompatibilityUtils.isInMultiWindowMode(activity);
 
-        return mChromeProvidedSharingOptionsProvider.getPropertyModels(
-                contentTypes, mIsMultiWindow);
+        mChromeProvidedSharingOptionsProvider.setShareRelatedParams(
+                shareParams, chromeShareExtras, shareStartTime, this, contentTypes);
+        mChromeProvidedSharingOptionsProvider.setIsMultiWindow(mIsMultiWindow);
+        return mChromeProvidedSharingOptionsProvider.calculatePropertyModels();
     }
 
     @VisibleForTesting
     List<PropertyModel> createThirdPartyPropertyModels(Activity activity, ShareParams params,
-            Set<Integer> contentTypes, boolean saveLastUsed) {
+            Set<Integer> contentTypes, boolean saveLastUsed, long shareStartTime) {
         if (params == null) return null;
         List<PropertyModel> models = mPropertyModelBuilder.selectThirdPartyApps(mBottomSheet,
-                contentTypes, params, saveLastUsed, params.getWindow(), mShareStartTime);
+                contentTypes, params, saveLastUsed, params.getWindow(), shareStartTime);
         // More...
         PropertyModel morePropertyModel = ShareSheetPropertyModelBuilder.createPropertyModel(
                 AppCompatResources.getDrawable(activity, R.drawable.sharing_more),
@@ -218,16 +215,22 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
             return;
         }
         boolean isMultiWindow = ApiCompatibilityUtils.isInMultiWindowMode(mActivity);
-        // mContentTypes is null if Chrome features should not be shown.
-        if (mIsMultiWindow == isMultiWindow || mContentTypes == null) {
+        if (mIsMultiWindow == isMultiWindow) {
             return;
         }
 
         mIsMultiWindow = isMultiWindow;
-        mBottomSheet.createFirstPartyRecyclerViews(
-                mChromeProvidedSharingOptionsProvider.getPropertyModels(
-                        mContentTypes, mIsMultiWindow));
-        mBottomSheetController.requestShowContent(mBottomSheet, /*animate=*/false);
+        mChromeProvidedSharingOptionsProvider.setIsMultiWindow(mIsMultiWindow);
+        List<PropertyModel> firstPartyOptions =
+                mChromeProvidedSharingOptionsProvider.calculatePropertyModels();
+
+        // firstPartyOptions is empty if Chrome features should not be shown.
+        if (firstPartyOptions == null || firstPartyOptions.isEmpty()) {
+            return;
+        }
+
+        mBottomSheet.createFirstPartyRecyclerViews(firstPartyOptions);
+        mBottomSheetController.requestShowContent(mBottomSheet, /* animate= */ false);
     }
 
     // View.OnLayoutChangeListener
@@ -242,5 +245,4 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
         mBottomSheet.getThirdPartyView().invalidate();
         mBottomSheet.getThirdPartyView().requestLayout();
     }
-
 }

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

@@ -22,6 +22,7 @@ import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.test.util.CommandLineFlags;
@@ -33,6 +34,8 @@ import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.share.ShareParams;
+import org.chromium.ui.base.ImmutableWeakReference;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.test.util.DummyUiActivity;
 
@@ -68,6 +71,9 @@ public final class ShareSheetCoordinatorTest {
     @Mock
     private ShareParams mParams;
 
+    @Mock
+    private WindowAndroid mWindow;
+
     private Activity mActivity;
     private ShareSheetCoordinator mShareSheetCoordinator;
 
@@ -95,6 +101,9 @@ public final class ShareSheetCoordinatorTest {
 
         mShareSheetCoordinator = new ShareSheetCoordinator(mController, mLifecycleDispatcher, null,
                 mPropertyModelBuilder, null, null, null, false);
+
+        Mockito.when(mParams.getWindow()).thenReturn(mWindow);
+        Mockito.when(mWindow.getActivity()).thenReturn(new ImmutableWeakReference<>(mActivity));
     }
 
     @Test
@@ -104,7 +113,7 @@ public final class ShareSheetCoordinatorTest {
 
         List<PropertyModel> propertyModels = mShareSheetCoordinator.createFirstPartyPropertyModels(
                 mActivity, mParams, /*chromeShareExtras=*/null,
-                ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES);
+                ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES, /*shareStartTime=*/0);
         assertEquals("Property model list should be empty.", 0, propertyModels.size());
     }
 
@@ -113,7 +122,7 @@ public final class ShareSheetCoordinatorTest {
     public void testCreateThirdPartyPropertyModels() {
         List<PropertyModel> propertyModels = mShareSheetCoordinator.createThirdPartyPropertyModels(
                 mActivity, mParams, ShareSheetPropertyModelBuilder.ALL_CONTENT_TYPES,
-                /*saveLastUsed=*/false);
+                /*saveLastUsed=*/false, /*shareStartTime=*/0);
 
         assertEquals("Incorrect number of property models.", 3, propertyModels.size());
         assertEquals("First property model isn't testModel1.", "testModel1",