summaryrefslogtreecommitdiffstats
path: root/sync/test
diff options
context:
space:
mode:
authormaxbogue <maxbogue@chromium.org>2015-10-30 09:36:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-30 16:36:52 +0000
commit9c1e60d7258b5f72e0899252b5f9fd23aa5a16dc (patch)
tree3136d5806ad0a1e83e4cb901c62e5381325a39b7 /sync/test
parent095f2d2efe7c765e0e35eb3077471e753a01c7cf (diff)
downloadchromium_src-9c1e60d7258b5f72e0899252b5f9fd23aa5a16dc.zip
chromium_src-9c1e60d7258b5f72e0899252b5f9fd23aa5a16dc.tar.gz
chromium_src-9c1e60d7258b5f72e0899252b5f9fd23aa5a16dc.tar.bz2
Finish removing AccountManagerDelegate.Callback.
This was left in http://crrev.com/1421343002 to prevent downstream from breaking, but downstream has now been converted. BUG=547973 Review URL: https://codereview.chromium.org/1419073005 Cr-Commit-Position: refs/heads/master@{#357121}
Diffstat (limited to 'sync/test')
-rw-r--r--sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java10
1 files changed, 4 insertions, 6 deletions
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