Finish removing AccountManagerDelegate.Callback.

sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java

Index: sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
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 60ecb573de884ab3922f05d9e0618974cf611d40..b227f22aeb6d1191800a9753daebae413df63375 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);
 }