[Android][Signin] Remove the boolean show welcome page for FRE

This CL removes the boolean FirstRunActivity.SHOW_WELCOME_PAGE since
after removing the Android EDU support it is always true.

Bug: 1056132
Change-Id: I8e7891d22d537364899a8a22f423cd4363e22982
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2074479Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746804}

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

@@ -85,8 +85,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
 
     private static FirstRunActivityObserver sObserver;
 
-    private boolean mShowWelcomePage = true;
-
     private String mResultSignInAccountName;
     private boolean mResultIsDefaultAccount;
     private boolean mResultShowSignInSettings;
@@ -121,12 +119,8 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
      * Defines a sequence of pages to be shown (depending on parameters etc).
      */
     private void createPageSequence() {
-        // An optional welcome page.
-        if (mShowWelcomePage) {
-            mPages.add(new ToSAndUMAFirstRunFragment.Page());
-            mFreProgressStates.add(FRE_PROGRESS_WELCOME_SHOWN);
-        }
-
+        mPages.add(new ToSAndUMAFirstRunFragment.Page());
+        mFreProgressStates.add(FRE_PROGRESS_WELCOME_SHOWN);
         // Other pages will be created by createPostNativePageSequence() after
         // native has been initialized.
     }
@@ -207,7 +201,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
                 }
 
                 mFreProperties = freProperties;
-                mShowWelcomePage = mFreProperties.getBoolean(SHOW_WELCOME_PAGE);
                 if (TextUtils.isEmpty(mResultSignInAccountName)) {
                     mResultSignInAccountName = mFreProperties.getString(
                             SigninFirstRunFragment.FORCE_SIGNIN_ACCOUNT_TO);
@@ -464,7 +457,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
     private boolean jumpToPage(int position) {
         if (sObserver != null) sObserver.onJumpToPage(position);
 
-        if (mShowWelcomePage && !didAcceptTermsOfService()) {
+        if (!didAcceptTermsOfService()) {
             return position == 0;
         }
         if (position >= mPagerAdapter.getCount()) {
@@ -478,7 +471,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
 
     private void stopProgressionIfNotAcceptedTermsOfService() {
         if (mPagerAdapter == null) return;
-        mPagerAdapter.setStopAtTheFirstPage(mShowWelcomePage && !didAcceptTermsOfService());
+        mPagerAdapter.setStopAtTheFirstPage(!didAcceptTermsOfService());
     }
 
     private void skipPagesIfNecessary() {

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

@@ -32,8 +32,6 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
     // received by ChromeLauncherActivity.)
     public static final String EXTRA_CHROME_LAUNCH_INTENT_EXTRAS =
             "Extra.FreChromeLaunchIntentExtras";
-
-    static final String SHOW_WELCOME_PAGE = "ShowWelcome";
     static final String SHOW_DATA_REDUCTION_PAGE = "ShowDataReduction";
     static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
     static final String SHOW_SIGNIN_PAGE = "ShowSignIn";

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

@@ -162,8 +162,6 @@ public abstract class FirstRunFlowSequencer  {
         }
 
         Bundle freProperties = new Bundle();
-        // TODO(https://crbug.com/1056132): Remove the boolean FirstRunActivity.SHOW_WELCOME_PAGE
-        freProperties.putBoolean(FirstRunActivity.SHOW_WELCOME_PAGE, true);
         freProperties.putInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS, mChildAccountStatus);
 
         // Initialize usage and crash reporting according to the default value.

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

@@ -194,13 +194,10 @@ public class FirstRunIntegrationTest {
         Assert.assertEquals(0, mTestObserver.updateCachedEngineCallback.getCallCount());
 
         // Accept the ToS.
-        if (freProperties.getBoolean(FirstRunActivityBase.SHOW_WELCOME_PAGE)) {
-            clickButton(mActivity, R.id.terms_accept, "Failed to accept ToS");
-            mTestObserver.jumpToPageCallback.waitForCallback(
-                    "Failed to try moving to the next screen", 0);
-            mTestObserver.acceptTermsOfServiceCallback.waitForCallback(
-                    "Failed to accept the ToS", 0);
-        }
+        clickButton(mActivity, R.id.terms_accept, "Failed to accept ToS");
+        mTestObserver.jumpToPageCallback.waitForCallback(
+                "Failed to try moving to the next screen", 0);
+        mTestObserver.acceptTermsOfServiceCallback.waitForCallback("Failed to accept the ToS", 0);
 
         // Acknowledge that Data Saver will be enabled.
         if (freProperties.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE)) {

chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java

@@ -191,13 +191,12 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_WELCOME_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_SIGNIN_PAGE));
         assertFalse(bundle.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(bundle.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
         assertEquals(ChildAccountStatus.NOT_CHILD,
                 bundle.getInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS));
-        assertEquals(5, bundle.size());
+        assertEquals(4, bundle.size());
     }
 
     @Test
@@ -219,7 +218,6 @@ public class FirstRunFlowSequencerTest {
         assertTrue(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_WELCOME_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_SIGNIN_PAGE));
         assertFalse(bundle.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(bundle.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
@@ -227,7 +225,7 @@ public class FirstRunFlowSequencerTest {
                 bundle.getInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS));
         assertEquals(
                 DEFAULT_ACCOUNT, bundle.getString(SigninFirstRunFragment.FORCE_SIGNIN_ACCOUNT_TO));
-        assertEquals(6, bundle.size());
+        assertEquals(5, bundle.size());
     }
 
     @Test
@@ -249,13 +247,12 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_WELCOME_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_SIGNIN_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE));
         assertFalse(bundle.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
         assertEquals(ChildAccountStatus.NOT_CHILD,
                 bundle.getInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS));
-        assertEquals(5, bundle.size());
+        assertEquals(4, bundle.size());
     }
 
     @Test
@@ -277,13 +274,12 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_WELCOME_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_SIGNIN_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE));
         assertTrue(bundle.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
         assertEquals(ChildAccountStatus.NOT_CHILD,
                 bundle.getInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS));
-        assertEquals(5, bundle.size());
+        assertEquals(4, bundle.size());
     }
 
     @Test