Expand test coverage for FRE

1. When CCT policy is set and Browser App FRE working as before;
2. When skip FRE shared pref set, FRE is not skipped with policy;
3. Variaties of test causes in *EnterpriseSupportTest, and histogram
for all the testcases.

Bug: 1120851
Change-Id: I766c66ca06dc5c90331c59e7f4392f5ab6d34d3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422687
Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810387}

chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java

@@ -69,7 +69,7 @@ public class FirstRunIntegrationTest {
     @Mock
     public FirstRunAppRestrictionInfo mMockAppRestrictionInfo;
     @Mock
-    public EnterpriseInfo mEntepriseInfo;
+    public EnterpriseInfo mEnterpriseInfo;
 
     private final Set<Class> mSupportedActivities =
             CollectionUtil.newHashSet(ChromeLauncherActivity.class, FirstRunActivity.class,
@@ -85,6 +85,7 @@ public class FirstRunIntegrationTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         FirstRunActivity.setObserverForTest(mTestObserver);
+        ToSAndUMAFirstRunFragment.setShowUmaCheckBoxForTesting(true);
 
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mContext = mInstrumentation.getTargetContext();
@@ -98,6 +99,7 @@ public class FirstRunIntegrationTest {
     @After
     public void tearDown() {
         FirstRunAppRestrictionInfo.setInitializedInstanceForTest(null);
+        ToSAndUMAFirstRunFragment.setShowUmaCheckBoxForTesting(false);
         EnterpriseInfo.setInstanceForTest(null);
         if (mLastActivity != null) mLastActivity.finish();
     }
@@ -133,9 +135,17 @@ public class FirstRunIntegrationTest {
                    callback.onResult(new EnterpriseInfo.OwnedState(true, false));
                    return null;
                })
-                .when(mEntepriseInfo)
+                .when(mEnterpriseInfo)
                 .getDeviceEnterpriseInfo(any());
-        EnterpriseInfo.setInstanceForTest(mEntepriseInfo);
+        EnterpriseInfo.setInstanceForTest(mEnterpriseInfo);
+    }
+
+    private void setCctTosDialogEnabledPolicy(boolean enabled) {
+        setHasAppRestrictionForMock();
+        Bundle restrictions = new Bundle();
+        restrictions.putBoolean("CCTToSDialogEnabled", enabled);
+        AbstractAppRestrictionsProvider.setTestRestrictions(restrictions);
+        setDeviceOwnedForMock();
     }
 
     @Test
@@ -191,6 +201,14 @@ public class FirstRunIntegrationTest {
         runSearchEnginePromptTest(LocaleManager.SearchEnginePromoType.SHOW_EXISTING);
     }
 
+    @Test
+    @MediumTest
+    public void testDefaultSearchEngine_WithCctPolicy() throws Exception {
+        setCctTosDialogEnabledPolicy(false);
+
+        runSearchEnginePromptTest(LocaleManager.SearchEnginePromoType.SHOW_EXISTING);
+    }
+
     private void runSearchEnginePromptTest(@SearchEnginePromoType final int searchPromoType)
             throws Exception {
         // Force the LocaleManager into a specific state.
@@ -269,11 +287,7 @@ public class FirstRunIntegrationTest {
     @Test
     @MediumTest
     public void testExitFirstRunWithPolicy() {
-        setHasAppRestrictionForMock();
-        Bundle restrictions = new Bundle();
-        restrictions.putBoolean("CCTToSDialogEnabled", false);
-        AbstractAppRestrictionsProvider.setTestRestrictions(restrictions);
-        setDeviceOwnedForMock();
+        setCctTosDialogEnabledPolicy(false);
 
         Intent intent =
                 CustomTabsTestUtils.createMinimalCustomTabIntent(mContext, "https://test.com");
@@ -287,9 +301,34 @@ public class FirstRunIntegrationTest {
                 "native never initialized.");
 
         waitForActivity(CustomTabActivity.class);
-
         Assert.assertFalse("Usage and crash reporting pref was set to true after skip",
                 PrivacyPreferencesManager.getInstance().isUsageAndCrashReportingPermittedByUser());
+        Assert.assertTrue(
+                "FRE should be skipped for CCT.", FirstRunStatus.isEphemeralSkipFirstRun());
+    }
+
+    @Test
+    @MediumTest
+    // TODO(https://crbug.com/1111490): Change this test case when policy can handle cases when ToS
+    // is accepted in Browser App.
+    public void testSkipTosPage_WithCctPolicy() throws Exception {
+        setCctTosDialogEnabledPolicy(false);
+        FirstRunStatus.setSkipWelcomePage(true);
+
+        Intent intent =
+                CustomTabsTestUtils.createMinimalCustomTabIntent(mContext, "https://test.com");
+        mContext.startActivity(intent);
+
+        FirstRunActivity freActivity = waitForActivity(FirstRunActivity.class);
+        CriteriaHelper.pollUiThread(
+                () -> freActivity.getSupportFragmentManager().getFragments().size() > 0);
+
+        // A page skip should happen, while we are still staying at FRE.
+        mTestObserver.jumpToPageCallback.waitForCallback("Welcome page should be skipped.", 0);
+        Assert.assertFalse(
+                "FRE should not be skipped for CCT.", FirstRunStatus.isEphemeralSkipFirstRun());
+        Assert.assertFalse(
+                "FreActivity should still be alive.", freActivity.isActivityFinishingOrDestroyed());
     }
 
     @Test