Revert of [Android]Don't check for child account/EDU device for every activity.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.firstrun;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 56 matching lines @@
             return;
         }
 
         new AndroidEduAndChildAccountHelper() {
             @Override
             public void onParametersReady() {
                 mIsAndroidEduDevice = isAndroidEduDevice();
                 mHasChildAccount = hasChildAccount();
                 processFreEnvironment();
             }
-        }.start(mActivity.getApplicationContext());
+        }.start(mActivity);
     }
 
     /**
      * @return Whether the sync could be turned on.
      */
     @VisibleForTesting
     boolean isSyncAllowed() {
         return FeatureUtilities.canAllowSync(mActivity)
                 && !SigninManager.get(mActivity.getApplicationContext()).isSigninDisabledByPolicy();
     }
@@ skipping 78 matching lines @@
             }
         } else {
             // If the full FRE has already been shown, don't show Welcome or Sign-In pages.
             freProperties.putBoolean(FirstRunActivity.SHOW_WELCOME_PAGE, false);
             freProperties.putBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE, false);
         }
 
         freProperties.putBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT, mHasChildAccount);
 
         onFlowIsKnown(mActivity, freProperties);
-        if (mHasChildAccount || forceEduSignIn) {
-            // Child and Edu forced signins are processed independently.
-            FirstRunSigninProcessor.setFirstRunFlowSignInComplete(context, true);
-        }
     }
 
     /**
      * Marks a given flow as completed.
      * @param activity An activity.
      * @param data Resulting FRE properties bundle.
      */
     public static void markFlowAsCompleted(Activity activity, Bundle data) {
         // When the user accepts ToS in the Setup Wizard (see ToSAckedReceiver), we do not
         // show the ToS page to the user because the user has already accepted one outside FRE.
         if (!PrefServiceBridge.getInstance().isFirstRunEulaAccepted()) {
             PrefServiceBridge.getInstance().setEulaAccepted();
         }
 
         // Mark the FRE flow as complete and set the sign-in flow preferences if necessary.
-        FirstRunSigninProcessor.finalizeFirstRunFlowState(activity, data);
+        FirstRunSignInProcessor.finalizeFirstRunFlowState(activity, data);
     }
 
     /**
      * Checks if the First Run needs to be launched.
      * @return The intent to launch the First Run Experience if necessary, or null.
      * @param activity       The context
      * @param fromChromeIcon Whether Chrome is opened via the Chrome icon
      */
     public static Intent checkIfFirstRunIsNecessary(Context context, boolean fromChromeIcon) {
         // If FRE is disabled (e.g. in tests), proceed directly to the intent handling.
@@ skipping 22 matching lines @@
      * @param fromChromeIcon Whether Chrome is opened via the Chrome icon
     */
     public static Intent createGenericFirstRunIntent(Context context, boolean fromChromeIcon) {
         Intent intent = new Intent();
         intent.setClassName(context, FirstRunActivity.class.getName());
         intent.putExtra(FirstRunActivity.COMING_FROM_CHROME_ICON, fromChromeIcon);
         intent.putExtra(FirstRunActivity.USE_FRE_FLOW_SEQUENCER, true);
         return intent;
     }
 }