Move AsyncTask helpers for accounts and features getters to AccountManagerHelper

This CL moves AsyncTask management from AccountManagerHelper delegates to
AccountManagerHelper itself (see bug for details).

BUG=698258

Review-Url: https://codereview.chromium.org/2778443002
Cr-Commit-Position: refs/heads/master@{#459736}

components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerDelegate.java

@@ -25,13 +25,6 @@ public interface AccountManagerDelegate {
     @WorkerThread
     Account[] getAccountsByType(String type);
 
-    /**
-     * Async version of {@link #getAccountsByType}
-     * This method is deprecated and will be removed soon.
-     */
-    @AnyThread
-    void getAccountsByType(String type, Callback<Account[]> callback);
-
     /**
      * Get an auth token.
      *
@@ -65,13 +58,6 @@ public interface AccountManagerDelegate {
     @WorkerThread
     boolean hasFeatures(Account account, String[] features);
 
-    /**
-     * Asynchronous version of {@link #hasFeatures}
-     * This method is deprecated and will be removed soon.
-     */
-    @AnyThread
-    void hasFeatures(Account account, String[] features, Callback<Boolean> callback);
-
     /**
      * Asks the user to enter a new password for an account, updating the saved credentials for the
      * account.

components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java

@@ -180,8 +180,18 @@ public class AccountManagerHelper {
     /**
      * Retrieves all Google accounts on the device asynchronously.
      */
-    public void getGoogleAccounts(Callback<Account[]> callback) {
-        mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE, callback);
+    public void getGoogleAccounts(final Callback<Account[]> callback) {
+        new AsyncTask<Void, Void, Account[]>() {
+            @Override
+            protected Account[] doInBackground(Void... params) {
+                return getGoogleAccounts();
+            }
+
+            @Override
+            protected void onPostExecute(Account[] accounts) {
+                callback.onResult(accounts);
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     /**
@@ -347,8 +357,26 @@ public class AccountManagerHelper {
     }
 
     public void checkChildAccount(Account account, Callback<Boolean> callback) {
-        String[] features = {FEATURE_IS_CHILD_ACCOUNT_KEY};
-        mAccountManager.hasFeatures(account, features, callback);
+        hasFeatures(account, new String[] {FEATURE_IS_CHILD_ACCOUNT_KEY}, callback);
+    }
+
+    private boolean hasFeatures(Account account, String[] features) {
+        return mAccountManager.hasFeatures(account, features);
+    }
+
+    private void hasFeatures(
+            final Account account, final String[] features, final Callback<Boolean> callback) {
+        new AsyncTask<Void, Void, Boolean>() {
+            @Override
+            public Boolean doInBackground(Void... params) {
+                return hasFeatures(account, features);
+            }
+
+            @Override
+            public void onPostExecute(Boolean value) {
+                callback.onResult(value);
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     /**

components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java

@@ -15,7 +15,6 @@ import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
@@ -63,21 +62,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
         return accounts;
     }
 
-    @Override
-    public void getAccountsByType(final String type, final Callback<Account[]> callback) {
-        new AsyncTask<Void, Void, Account[]>() {
-            @Override
-            protected Account[] doInBackground(Void... params) {
-                return getAccountsByType(type);
-            }
-
-            @Override
-            protected void onPostExecute(Account[] accounts) {
-                callback.onResult(accounts);
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
     @Override
     public String getAuthToken(Account account, String authTokenScope) throws AuthException {
         assert !ThreadUtils.runningOnUiThread();
@@ -128,23 +112,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
         return false;
     }
 
-    @Override
-    public void hasFeatures(
-            final Account account, final String[] features, final Callback<Boolean> callback) {
-        AsyncTask<Void, Void, Boolean> task = new AsyncTask<Void, Void, Boolean>() {
-            @Override
-            public Boolean doInBackground(Void... params) {
-                return hasFeatures(account, features);
-            }
-
-            @Override
-            public void onPostExecute(Boolean value) {
-                callback.onResult(value);
-            }
-        };
-        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
     /**
      * Records a histogram value for how long time an action has taken using
      * {@link RecordHistogram#recordTimesHistogram(String, long, TimeUnit))} iff the browser

components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/util/MockAccountManager.java

@@ -8,7 +8,6 @@ import android.accounts.Account;
 import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
 import android.content.Context;
-import android.os.AsyncTask;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
@@ -73,23 +72,6 @@ public class MockAccountManager implements AccountManagerDelegate {
         return validAccounts.toArray(new Account[0]);
     }
 
-    @Override
-    public void getAccountsByType(final String type, final Callback<Account[]> callback) {
-        mGetAccountsTaskCounter.increment();
-        new AsyncTask<Void, Void, Account[]>() {
-            @Override
-            protected Account[] doInBackground(Void... params) {
-                return getAccountsByType(type);
-            }
-
-            @Override
-            protected void onPostExecute(Account[] accounts) {
-                callback.onResult(accounts);
-                mGetAccountsTaskCounter.decrement();
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
     @VisibleForTesting
     public void waitForGetAccountsTask() throws InterruptedException {
         // Wait until all tasks are done because we don't know which is being waited for.
@@ -169,17 +151,6 @@ public class MockAccountManager implements AccountManagerDelegate {
         return hasAllFeatures;
     }
 
-    @Override
-    public void hasFeatures(
-            final Account account, final String[] features, final Callback<Boolean> callback) {
-        ThreadUtils.postOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                callback.onResult(hasFeatures(account, features));
-            }
-        });
-    }
-
     @Override
     public void updateCredentials(
             Account account, Activity activity, final Callback<Boolean> callback) {