ChildAccountService[Java] delegates everything to native side.

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
index d234262c66ba9dee16e94528d538355395414768..492b771bb3c029da39f3160f389bea3196ca2c77 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
@@ -204,11 +204,11 @@ public class AccountManagementFragment extends PreferenceFragment
     }
 
     private void configureSignOutSwitch() {
-        boolean hasChildAccount = ChildAccountService.getInstance(getActivity()).hasChildAccount();
+        boolean isChildAccount = ChildAccountService.isChildAccount();
 
         ChromeSwitchPreference signOutSwitch =
                 (ChromeSwitchPreference) findPreference(PREF_SIGN_OUT_SWITCH);
-        if (hasChildAccount) {
+        if (isChildAccount) {
             getPreferenceScreen().removePreference(signOutSwitch);
         } else {
             getPreferenceScreen().removePreference(findPreference(PREF_SIGN_IN_CHILD_MESSAGE));
@@ -242,7 +242,7 @@ public class AccountManagementFragment extends PreferenceFragment
     private void configureAddAccountPreference(String fullName) {
         ChromeBasePreference addAccount = (ChromeBasePreference) findPreference(PREF_ADD_ACCOUNT);
 
-        if (ChildAccountService.getInstance(getActivity()).hasChildAccount()) {
+        if (ChildAccountService.isChildAccount()) {
             getPreferenceScreen().removePreference(addAccount);
         } else {
             String addAccountString = getResources().getString(
@@ -272,11 +272,11 @@ public class AccountManagementFragment extends PreferenceFragment
     }
 
     private void configureGoIncognitoPreferences(String fullName) {
-        boolean hasChildAccount = ChildAccountService.getInstance(getActivity()).hasChildAccount();
+        boolean isChildAccount = ChildAccountService.isChildAccount();
         Preference notYouPref = findPreference(PREF_NOT_YOU);
         ChromeBasePreference goIncognito = (ChromeBasePreference) findPreference(PREF_GO_INCOGNITO);
 
-        if (hasChildAccount) {
+        if (isChildAccount) {
             getPreferenceScreen().removePreference(notYouPref);
             getPreferenceScreen().removePreference(goIncognito);
         } else {
@@ -328,7 +328,7 @@ public class AccountManagementFragment extends PreferenceFragment
         Preference parentAccounts = findPreference(PREF_PARENT_ACCOUNTS);
         Preference childContent = findPreference(PREF_CHILD_CONTENT);
         Preference childSafeSearch = findPreference(PREF_CHILD_SAFE_SEARCH);
-        if (ChildAccountService.getInstance(getActivity()).hasChildAccount()) {
+        if (ChildAccountService.isChildAccount()) {
             Resources res = getActivity().getResources();
             PrefServiceBridge prefService = PrefServiceBridge.getInstance();
 
@@ -391,8 +391,7 @@ public class AccountManagementFragment extends PreferenceFragment
             String signedInAccountName =
                     ChromeSigninController.get(getActivity()).getSignedInAccountName();
             boolean isPrimaryAccount = TextUtils.equals(account.name, signedInAccountName);
-            boolean isChildAccount =
-                    ChildAccountService.getInstance(getActivity()).hasChildAccount();
+            boolean isChildAccount = ChildAccountService.isChildAccount();
 
             pref.setIcon(new BitmapDrawable(getResources(), isChildAccount
                     ? getBadgedUserPicture(account.name) : getUserPicture(account.name)));
@@ -495,7 +494,7 @@ public class AccountManagementFragment extends PreferenceFragment
         ProfileSyncService profileSyncService = ProfileSyncService.get();
         Resources res = activity.getResources();
 
-        if (ChildAccountService.getInstance(activity).hasChildAccount()) {
+        if (ChildAccountService.isChildAccount()) {
             return res.getString(R.string.kids_account);
         }