Convert AccountManagerDelegate.Callback to use base.Callback.

The new generic Callback implementation should be used to simplify code and interfaces.

BUG=547973

Review URL: https://codereview.chromium.org/1421343002

Cr-Commit-Position: refs/heads/master@{#356345}

3 files changed, 30 insertions, 8 deletions

diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
index 4cc32a1..60ecb57 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
@@ -28,7 +28,8 @@ public interface AccountManagerDelegate {
     @Deprecated
     Account[] getAccountsByType(String type);
 
-    void getAccountsByType(String type, Callback<Account[]> callback);
+    // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed.
+    void getAccountsByType(String type, org.chromium.base.Callback<Account[]> callback);
 
     AccountManagerFuture<Bundle> getAuthToken(Account account, String authTokenType,
             boolean notifyAuthFailure, AccountManagerCallback<Bundle> callback, Handler handler);
@@ -37,5 +38,7 @@ public interface AccountManagerDelegate {
 
     AuthenticatorDescription[] getAuthenticatorTypes();
 
-    void hasFeatures(Account account, String[] features, Callback<Boolean> callback);
+    // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed.
+    void hasFeatures(
+            Account account, String[] features, org.chromium.base.Callback<Boolean> callback);
 }
diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
index a73769a..8b1b0c3 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -20,6 +20,7 @@ import android.os.Bundle;
 import android.os.Process;
 import android.util.Log;
 
+import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.net.NetworkChangeNotifier;
@@ -165,7 +166,10 @@ public class AccountManagerHelper {
         return mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
     }
 
-    public void getGoogleAccounts(AccountManagerDelegate.Callback<Account[]> callback) {
+    /**
+     * Retrieves all Google accounts on the device asynchronously.
+     */
+    public void getGoogleAccounts(Callback<Account[]> callback) {
         mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE, callback);
     }
 
@@ -373,8 +377,7 @@ public class AccountManagerHelper {
         }
     }
 
-    public void checkChildAccount(
-            Account account, AccountManagerDelegate.Callback<Boolean> callback) {
+    public void checkChildAccount(Account account, Callback<Boolean> callback) {
         String[] features = {FEATURE_IS_CHILD_ACCOUNT_KEY};
         mAccountManager.hasFeatures(account, features, callback);
     }
diff --git a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
index 8688314..5865586 100644
--- a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
@@ -53,8 +53,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
         return accounts;
     }
 
+    // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed.
     @Override
-    public void getAccountsByType(final String type, final Callback<Account[]> callback) {
+    public void getAccountsByType(
+            final String type, final org.chromium.base.Callback<Account[]> callback) {
         new AsyncTask<Void, Void, Account[]>() {
             @Override
             protected Account[] doInBackground(Void... params) {
@@ -63,7 +65,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
 
             @Override
             protected void onPostExecute(Account[] accounts) {
-                callback.gotResult(accounts);
+                callback.onResult(accounts);
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
@@ -92,9 +94,23 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
         return mAccountManager.getAuthenticatorTypes();
     }
 
+    // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed.
     @Override
     public void hasFeatures(Account account, String[] features,
-            final AccountManagerDelegate.Callback<Boolean> callback) {
+            final org.chromium.base.Callback<Boolean> callback) {
+        hasFeatures(account, features, new Callback<Boolean>() {
+            @Override
+            public void gotResult(Boolean result) {
+                callback.onResult(result);
+            }
+        });
+    }
+
+    /**
+     * TODO(maxbogue): Remove once downstream override is removed.
+     */
+    @Deprecated
+    public void hasFeatures(Account account, String[] features, final Callback<Boolean> callback) {
         if (!AccountManagerHelper.get(mApplicationContext).hasGetAccountsPermission()) {
             ThreadUtils.postOnUiThread(new Runnable() {
                 @Override