Finish removing AccountManagerDelegate.Callback.

sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java

Index: sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
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 0420772f0ba328e880d980ef690e2fb5be4da77e..3b3fd39313cc7daf4f06f4aeb4d3cd48fc9d9925 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