[Android FRE] Move constants from FirstRunActivity to FirstRunActivityBase

This is a follow up to
https://chromium-review.googlesource.com/c/chromium/src/+/619252

BUG=None

Change-Id: I8ede7cbf035fec5cba4884a4078b025e54e07cd3
Reviewed-on: https://chromium-review.googlesource.com/701694
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506642}

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

@@ -59,21 +59,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         void onAbortFirstRunExperience();
     }
 
-    // Incoming parameters:
-    public static final String EXTRA_COMING_FROM_CHROME_ICON = "Extra.ComingFromChromeIcon";
-    public static final String EXTRA_CHROME_LAUNCH_INTENT = "Extra.FreChromeLaunchIntent";
-
-    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";
-
-    // Outgoing results:
-    public static final String EXTRA_FIRST_RUN_ACTIVITY_RESULT = "Extra.FreActivityResult";
-    public static final String EXTRA_FIRST_RUN_COMPLETE = "Extra.FreComplete";
-
-    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
-
     // UMA constants.
     private static final int SIGNIN_SETTINGS_DEFAULT_ACCOUNT = 0;
     private static final int SIGNIN_SETTINGS_ANOTHER_ACCOUNT = 1;
@@ -304,8 +289,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putBoolean(
-                FirstRunActivity.EXTRA_COMING_FROM_CHROME_ICON, mLaunchedFromChromeIcon);
+        outState.putBoolean(EXTRA_COMING_FROM_CHROME_ICON, mLaunchedFromChromeIcon);
     }
 
     @Override
@@ -464,8 +448,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         } else if (getIntent() != null) {
             readFrom = getIntent().getExtras();
         }
-        mLaunchedFromChromeIcon =
-                readFrom.getBoolean(FirstRunActivity.EXTRA_COMING_FROM_CHROME_ICON);
+        mLaunchedFromChromeIcon = readFrom.getBoolean(EXTRA_COMING_FROM_CHROME_ICON);
     }
 
     /**

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

@@ -22,6 +22,21 @@ import org.chromium.chrome.browser.util.IntentUtils;
 public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
     private static final String TAG = "FirstRunActivity";
 
+    // Incoming parameters:
+    public static final String EXTRA_COMING_FROM_CHROME_ICON = "Extra.ComingFromChromeIcon";
+    public static final String EXTRA_CHROME_LAUNCH_INTENT = "Extra.FreChromeLaunchIntent";
+
+    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";
+
+    // Outgoing results:
+    public static final String EXTRA_FIRST_RUN_ACTIVITY_RESULT = "Extra.FreActivityResult";
+    public static final String EXTRA_FIRST_RUN_COMPLETE = "Extra.FreComplete";
+
+    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
+
     private boolean mNativeInitialized;
 
     @Override
@@ -72,13 +87,13 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
      * @return Whether a pending intent was sent.
      */
     protected final boolean sendPendingIntentIfNecessary(final boolean complete) {
-        PendingIntent pendingIntent = IntentUtils.safeGetParcelableExtra(
-                getIntent(), FirstRunActivity.EXTRA_CHROME_LAUNCH_INTENT);
+        PendingIntent pendingIntent =
+                IntentUtils.safeGetParcelableExtra(getIntent(), EXTRA_CHROME_LAUNCH_INTENT);
         if (pendingIntent == null) return false;
 
         Intent extraDataIntent = new Intent();
-        extraDataIntent.putExtra(FirstRunActivity.EXTRA_FIRST_RUN_ACTIVITY_RESULT, true);
-        extraDataIntent.putExtra(FirstRunActivity.EXTRA_FIRST_RUN_COMPLETE, complete);
+        extraDataIntent.putExtra(EXTRA_FIRST_RUN_ACTIVITY_RESULT, true);
+        extraDataIntent.putExtra(EXTRA_FIRST_RUN_COMPLETE, complete);
 
         try {
             // After the PendingIntent has been sent, send a first run callback to custom tabs if

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

@@ -290,7 +290,7 @@ public class FirstRunIntegrationTest {
         Assert.assertEquals(0, mTestObserver.updateCachedEngineCallback.getCallCount());
 
         // Accept the ToS.
-        if (freProperties.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE)) {
+        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);
@@ -299,7 +299,7 @@ public class FirstRunIntegrationTest {
         }
 
         // Acknowledge that Data Saver will be enabled.
-        if (freProperties.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE)) {
+        if (freProperties.getBoolean(FirstRunActivityBase.SHOW_DATA_REDUCTION_PAGE)) {
             int jumpCallCount = mTestObserver.jumpToPageCallback.getCallCount();
             clickButton(mActivity, R.id.next_button, "Failed to skip data saver");
             mTestObserver.jumpToPageCallback.waitForCallback(
@@ -309,10 +309,10 @@ public class FirstRunIntegrationTest {
         // Select a default search engine.
         if (searchPromoType == LocaleManager.SEARCH_ENGINE_PROMO_DONT_SHOW) {
             Assert.assertFalse("Search engine page was shown.",
-                    freProperties.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+                    freProperties.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
         } else {
             Assert.assertTrue("Search engine page wasn't shown.",
-                    freProperties.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+                    freProperties.getBoolean(FirstRunActivityBase.SHOW_SEARCH_ENGINE_PAGE));
             int jumpCallCount = mTestObserver.jumpToPageCallback.getCallCount();
             DefaultSearchEngineDialogHelperUtils.clickOnFirstEngine(
                     mActivity.findViewById(android.R.id.content));
@@ -322,7 +322,7 @@ public class FirstRunIntegrationTest {
         }
 
         // Don't sign in the user.
-        if (freProperties.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE)) {
+        if (freProperties.getBoolean(FirstRunActivityBase.SHOW_SIGNIN_PAGE)) {
             int jumpCallCount = mTestObserver.jumpToPageCallback.getCallCount();
             clickButton(mActivity, R.id.negative_button, "Failed to skip signing-in");
             mTestObserver.jumpToPageCallback.waitForCallback(

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

@@ -176,10 +176,10 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+        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));
         assertFalse(bundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertEquals(5, bundle.size());
     }
@@ -204,10 +204,10 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+        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));
         assertFalse(bundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertTrue(bundle.getBoolean(AccountFirstRunFragment.PRESELECT_BUT_ALLOW_TO_CHANGE));
         assertEquals(
@@ -235,10 +235,10 @@ public class FirstRunFlowSequencerTest {
         assertTrue(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+        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));
         assertTrue(bundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertFalse(bundle.getBoolean(AccountFirstRunFragment.PRESELECT_BUT_ALLOW_TO_CHANGE));
         assertEquals(
@@ -265,10 +265,10 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertFalse(bundle.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+        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));
         assertFalse(bundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertEquals(5, bundle.size());
     }
@@ -292,10 +292,10 @@ public class FirstRunFlowSequencerTest {
         assertFalse(mSequencer.calledSetFirstRunFlowSignInComplete);
 
         Bundle bundle = mSequencer.returnedBundle;
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_WELCOME_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_DATA_REDUCTION_PAGE));
-        assertTrue(bundle.getBoolean(FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE));
+        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));
         assertFalse(bundle.getBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT));
         assertEquals(5, bundle.size());
     }