Remove sEnableEnterpriseCCT sentinel.

Bug: 1103476
Change-Id: Iabfeafad5641f6735dfc243e5000369bc416338e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366653Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800283}

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

@@ -85,8 +85,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
     private static final int FRE_PROGRESS_MAX = 7;
 
     private static FirstRunActivityObserver sObserver;
-    // TODO(wenyufu): Remove when MVP for crbug.com/1103476 is complete.
-    private static boolean sEnableEnterpriseCCT;
 
     private String mResultSignInAccountName;
     private boolean mResultIsDefaultAccount;
@@ -143,7 +141,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         //  use the subclass ToSAndUmaCCTFirstRunFragment. Instead, use the base class
         //  (ToSAndUMAFirstRunFragment) which simply shows a loading spinner while waiting for
         //  native to be loaded.
-        return sEnableEnterpriseCCT && mLaunchedFromCCT && !FirstRunStatus.shouldSkipWelcomePage();
+        return mLaunchedFromCCT && !FirstRunStatus.shouldSkipWelcomePage();
     }
 
     private void createPostNativePageSequence() {
@@ -575,9 +573,4 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         assert sObserver == null;
         sObserver = observer;
     }
-
-    @VisibleForTesting
-    public static void setEnableEnterpriseCCTForTest(boolean isEnabled) {
-        sEnableEnterpriseCCT = isEnabled;
-    }
 }

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

@@ -96,7 +96,6 @@ public class FirstRunIntegrationTest {
 
     @After
     public void tearDown() {
-        FirstRunActivity.setEnableEnterpriseCCTForTest(false);
         FirstRunAppRestrictionInfo.setInstanceForTest(null);
         EnterpriseInfo.setInstanceForTest(null);
         if (mLastActivity != null) mLastActivity.finish();
@@ -270,7 +269,6 @@ public class FirstRunIntegrationTest {
     @MediumTest
     public void testExitFirstRunWithPolicy() {
         setHasAppRestrictionForMock();
-        FirstRunActivity.setEnableEnterpriseCCTForTest(true);
         Bundle restrictions = new Bundle();
         restrictions.putBoolean("CCTToSDialogEnabled", false);
         AbstractAppRestrictionsProvider.setTestRestrictions(restrictions);

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

@@ -93,7 +93,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest {
         Assert.assertFalse(
                 CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE));
 
-        FirstRunActivity.setEnableEnterpriseCCTForTest(true);
         FirstRunAppRestrictionInfo.setInstanceForTest(mMockAppRestrictionInfo);
         PolicyServiceFactory.setPolicyServiceForTest(mPolicyService);
         FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils);
@@ -131,7 +130,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest {
 
     @After
     public void tearDown() {
-        FirstRunActivity.setEnableEnterpriseCCTForTest(false);
         FirstRunAppRestrictionInfo.setInstanceForTest(null);
         PolicyServiceFactory.setPolicyServiceForTest(null);
         FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils);