diff options
3 files changed, 12 insertions, 38 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 60ecb57..b227f22 100644 --- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java +++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java @@ -11,25 +11,19 @@ import android.accounts.AuthenticatorDescription; import android.os.Bundle; import android.os.Handler; +import org.chromium.base.Callback; + /** * Wrapper around the Android account manager, to facilitate dependency injection during testing. */ public interface AccountManagerDelegate { /** - * A callback class that can be used to allow asynchronous methods. - */ - interface Callback<T> { - void gotResult(T value); - } - - /** * Use the asynchronous getAccountsByType(String, Callback<Account[]>) instead. */ @Deprecated Account[] getAccountsByType(String type); - // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed. - void getAccountsByType(String type, org.chromium.base.Callback<Account[]> callback); + void getAccountsByType(String type, Callback<Account[]> callback); AccountManagerFuture<Bundle> getAuthToken(Account account, String authTokenType, boolean notifyAuthFailure, AccountManagerCallback<Bundle> callback, Handler handler); @@ -38,7 +32,5 @@ public interface AccountManagerDelegate { AuthenticatorDescription[] getAuthenticatorTypes(); - // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed. - void hasFeatures( - Account account, String[] features, org.chromium.base.Callback<Boolean> callback); + void hasFeatures(Account account, String[] features, Callback<Boolean> 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 5865586..75777dd 100644 --- a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java +++ b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java @@ -18,6 +18,7 @@ import android.os.Handler; import android.os.StrictMode; import android.os.SystemClock; +import org.chromium.base.Callback; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.library_loader.LibraryLoader; @@ -53,10 +54,8 @@ 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 org.chromium.base.Callback<Account[]> callback) { + public void getAccountsByType(final String type, final Callback<Account[]> callback) { new AsyncTask<Void, Void, Account[]>() { @Override protected Account[] doInBackground(Void... params) { @@ -94,28 +93,13 @@ 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 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 public void run() { - callback.gotResult(false); + callback.onResult(false); } }); return; @@ -132,7 +116,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { } catch (OperationCanceledException e) { Log.e(TAG, "Checking features was cancelled. This should not happen."); } - callback.gotResult(hasFeatures); + callback.onResult(hasFeatures); } }, null /* handler */); } diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java index 0420772..3b3fd39 100644 --- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java +++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java @@ -26,6 +26,7 @@ import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; +import org.chromium.base.Callback; import org.chromium.base.Log; import org.chromium.base.VisibleForTesting; import org.chromium.sync.signin.AccountManagerDelegate; @@ -136,10 +137,8 @@ public class MockAccountManager implements AccountManagerDelegate { } } - // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed. @Override - public void getAccountsByType( - final String type, final org.chromium.base.Callback<Account[]> callback) { + public void getAccountsByType(final String type, final Callback<Account[]> callback) { new AsyncTask<Void, Void, Account[]>() { @Override protected Account[] doInBackground(Void... params) { @@ -281,10 +280,9 @@ public class MockAccountManager implements AccountManagerDelegate { return new AuthenticatorDescription[] { googleAuthenticator }; } - // TODO(maxbogue): Remove full Callback path once AccountManagerDelegate.Callback is removed. @Override - public void hasFeatures(Account account, final String[] features, - final org.chromium.base.Callback<Boolean> callback) { + public void hasFeatures( + Account account, final String[] features, final Callback<Boolean> callback) { final AccountHolder accountHolder = getAccountHolder(account); accountHolder.addFeaturesCallback(new Runnable() { @Override |