| Index: chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
|
| index c3c9262e2bfdc2761175f32f520e20d17da84b1a..6fa8aa04defbec0f9afdca6c4b89cfe93bc9110b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
|
| @@ -9,6 +9,7 @@
|
| import android.content.Context;
|
|
|
| import org.chromium.base.Callback;
|
| +import org.chromium.base.ContextUtils;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.components.signin.AccountManagerHelper;
|
| @@ -41,7 +42,7 @@
|
| */
|
| public static void checkHasChildAccount(Context context, final Callback<Boolean> callback) {
|
| ThreadUtils.assertOnUiThread();
|
| - final AccountManagerHelper helper = AccountManagerHelper.get();
|
| + final AccountManagerHelper helper = AccountManagerHelper.get(context);
|
| helper.getGoogleAccounts(new Callback<Account[]>() {
|
| @Override
|
| public void onResult(Account[] accounts) {
|
| @@ -89,12 +90,13 @@
|
| }
|
|
|
| Account account = AccountManagerHelper.createAccountFromName(accountName);
|
| - AccountManagerHelper.get().updateCredentials(account, activity, new Callback<Boolean>() {
|
| - @Override
|
| - public void onResult(Boolean result) {
|
| - nativeOnReauthenticationResult(nativeCallback, result);
|
| - }
|
| - });
|
| + AccountManagerHelper.get(ContextUtils.getApplicationContext())
|
| + .updateCredentials(account, activity, new Callback<Boolean>() {
|
| + @Override
|
| + public void onResult(Boolean result) {
|
| + nativeOnReauthenticationResult(nativeCallback, result);
|
| + }
|
| + });
|
| }
|
|
|
| private static native boolean nativeIsChildAccount();
|
|
|