Commit 5178a2e3 authored by Sky Malice's avatar Sky Malice Committed by Commit Bot

Remove sEnableEnterpriseCCT sentinel.

Bug: 1103476
Change-Id: Iabfeafad5641f6735dfc243e5000369bc416338e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366653Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarWenyu Fu <wenyufu@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800283}
parent b930822c
...@@ -85,8 +85,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa ...@@ -85,8 +85,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
private static final int FRE_PROGRESS_MAX = 7; private static final int FRE_PROGRESS_MAX = 7;
private static FirstRunActivityObserver sObserver; private static FirstRunActivityObserver sObserver;
// TODO(wenyufu): Remove when MVP for crbug.com/1103476 is complete.
private static boolean sEnableEnterpriseCCT;
private String mResultSignInAccountName; private String mResultSignInAccountName;
private boolean mResultIsDefaultAccount; private boolean mResultIsDefaultAccount;
...@@ -143,7 +141,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa ...@@ -143,7 +141,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
// use the subclass ToSAndUmaCCTFirstRunFragment. Instead, use the base class // use the subclass ToSAndUmaCCTFirstRunFragment. Instead, use the base class
// (ToSAndUMAFirstRunFragment) which simply shows a loading spinner while waiting for // (ToSAndUMAFirstRunFragment) which simply shows a loading spinner while waiting for
// native to be loaded. // native to be loaded.
return sEnableEnterpriseCCT && mLaunchedFromCCT && !FirstRunStatus.shouldSkipWelcomePage(); return mLaunchedFromCCT && !FirstRunStatus.shouldSkipWelcomePage();
} }
private void createPostNativePageSequence() { private void createPostNativePageSequence() {
...@@ -575,9 +573,4 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa ...@@ -575,9 +573,4 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
assert sObserver == null; assert sObserver == null;
sObserver = observer; sObserver = observer;
} }
@VisibleForTesting
public static void setEnableEnterpriseCCTForTest(boolean isEnabled) {
sEnableEnterpriseCCT = isEnabled;
}
} }
...@@ -96,7 +96,6 @@ public class FirstRunIntegrationTest { ...@@ -96,7 +96,6 @@ public class FirstRunIntegrationTest {
@After @After
public void tearDown() { public void tearDown() {
FirstRunActivity.setEnableEnterpriseCCTForTest(false);
FirstRunAppRestrictionInfo.setInstanceForTest(null); FirstRunAppRestrictionInfo.setInstanceForTest(null);
EnterpriseInfo.setInstanceForTest(null); EnterpriseInfo.setInstanceForTest(null);
if (mLastActivity != null) mLastActivity.finish(); if (mLastActivity != null) mLastActivity.finish();
...@@ -270,7 +269,6 @@ public class FirstRunIntegrationTest { ...@@ -270,7 +269,6 @@ public class FirstRunIntegrationTest {
@MediumTest @MediumTest
public void testExitFirstRunWithPolicy() { public void testExitFirstRunWithPolicy() {
setHasAppRestrictionForMock(); setHasAppRestrictionForMock();
FirstRunActivity.setEnableEnterpriseCCTForTest(true);
Bundle restrictions = new Bundle(); Bundle restrictions = new Bundle();
restrictions.putBoolean("CCTToSDialogEnabled", false); restrictions.putBoolean("CCTToSDialogEnabled", false);
AbstractAppRestrictionsProvider.setTestRestrictions(restrictions); AbstractAppRestrictionsProvider.setTestRestrictions(restrictions);
......
...@@ -93,7 +93,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest { ...@@ -93,7 +93,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest {
Assert.assertFalse( Assert.assertFalse(
CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)); CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE));
FirstRunActivity.setEnableEnterpriseCCTForTest(true);
FirstRunAppRestrictionInfo.setInstanceForTest(mMockAppRestrictionInfo); FirstRunAppRestrictionInfo.setInstanceForTest(mMockAppRestrictionInfo);
PolicyServiceFactory.setPolicyServiceForTest(mPolicyService); PolicyServiceFactory.setPolicyServiceForTest(mPolicyService);
FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils); FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils);
...@@ -131,7 +130,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest { ...@@ -131,7 +130,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupportTest {
@After @After
public void tearDown() { public void tearDown() {
FirstRunActivity.setEnableEnterpriseCCTForTest(false);
FirstRunAppRestrictionInfo.setInstanceForTest(null); FirstRunAppRestrictionInfo.setInstanceForTest(null);
PolicyServiceFactory.setPolicyServiceForTest(null); PolicyServiceFactory.setPolicyServiceForTest(null);
FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils); FirstRunUtilsJni.TEST_HOOKS.setInstanceForTesting(mFirstRunUtils);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment