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

chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java
index 2b788d96c194652eac46124d5bb25c6f75c92240..81c1c5e0c7dc4ace7f7f2ee631bf4c5426241375 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java
@@ -4,23 +4,20 @@
 
 package org.chromium.chrome.browser.services;
 
-import android.content.Context;
+import android.app.Activity;
 
-import org.chromium.base.Log;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.childaccounts.ChildAccountService;
 
 /**
  * A helper for Android EDU and child account checks.
  * Usage:
- * new AndroidEduAndChildAccountHelper() { override onParametersReady() }.start(appContext).
+ * new AndroidEduAndChildAccountHelper() { override onParametersReady() }.start(activity).
  */
 public abstract class AndroidEduAndChildAccountHelper
         implements ChildAccountService.HasChildAccountCallback, AndroidEduOwnerCheckCallback {
     private Boolean mIsAndroidEduDevice;
     private Boolean mHasChildAccount;
-    // Abbreviated to < 20 chars.
-    private static final String TAG = "EduChildHelper";
 
     /** The callback called when Android EDU and child account parameters are known. */
     public abstract void onParametersReady();
@@ -38,26 +35,26 @@
     /**
      * Starts fetching the Android EDU and child accounts information.
      * Calls onParametersReady() once the information is fetched.
-     * @param appContext The application context.
+     * @param activity The context.
      */
-    public void start(Context appContext) {
-        Log.d(TAG, "before checking child and EDU");
-        ChildAccountService.getInstance(appContext).checkHasChildAccount(this);
-        ((ChromeApplication) appContext).checkIsAndroidEduDevice(this);
+    public void start(Activity activity) {
+        android.util.Log.i("AndroidEduAndChildAccountHelper", "before checking child and EDU");
+        ChildAccountService.getInstance(activity).checkHasChildAccount(this);
+        ((ChromeApplication) activity.getApplication()).checkIsAndroidEduDevice(this);
         // TODO(aruslan): Should we start a watchdog to kill if Child/Edu stuff takes too long?
-        Log.d(TAG, "returning from start");
+        android.util.Log.i("AndroidEduAndChildAccountHelper", "returning from start");
     }
 
     private void checkDone() {
         if (mIsAndroidEduDevice == null || mHasChildAccount == null) return;
-        Log.d(TAG, "parameters are ready");
+        android.util.Log.i("AndroidEduAndChildAccountHelper", "parameters are ready");
         onParametersReady();
     }
 
     // AndroidEdu.OwnerCheckCallback:
     @Override
     public void onSchoolCheckDone(boolean isAndroidEduDevice) {
-        Log.d(TAG, "onSchoolCheckDone");
+        android.util.Log.i("AndroidEduAndChildAccountHelper", "onSchoolCheckDone");
         mIsAndroidEduDevice = isAndroidEduDevice;
         checkDone();
     }
@@ -65,7 +62,7 @@
     // ChildAccountManager.HasChildAccountCallback:
     @Override
     public void onChildAccountChecked(boolean hasChildAccount) {
-        Log.d(TAG, "onChildAccountChecked");
+        android.util.Log.i("AndroidEduAndChildAccountHelper", "onChildAccountChecked");
         mHasChildAccount = hasChildAccount;
         checkDone();
     }