[Sync] Actually fix build spam from AMH deprecations.

Apparently @deprecated inside a javadoc still generates the output.

BUG=517697

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

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

2 files changed, 21 insertions, 13 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 b227f22..cef541e 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
@@ -18,9 +18,10 @@ import org.chromium.base.Callback;
  */
 public interface AccountManagerDelegate {
     /**
-     * Use the asynchronous getAccountsByType(String, Callback<Account[]>) instead.
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
-    @Deprecated
     Account[] getAccountsByType(String type);
 
     void getAccountsByType(String type, Callback<Account[]> 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 761447e..dc3cd94 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -151,8 +151,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * Use the asynchronous version below instead. See http://crbug.com/517697.
-     * @deprecated
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public List<String> getGoogleAccountNames() {
         List<String> accountNames = new ArrayList<String>();
@@ -179,8 +180,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * Use the asynchronous version below instead. See http://crbug.com/517697.
-     * @deprecated
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public Account[] getGoogleAccounts() {
         return mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
@@ -194,8 +196,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * Use the asynchronous version below instead. See http://crbug.com/517697.
-     * @deprecated
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public boolean hasGoogleAccounts() {
         return getGoogleAccounts().length > 0;
@@ -227,8 +230,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * Use the asynchronous version below instead. See http://crbug.com/517697.
-     * @deprecated
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public Account getAccountFromName(String accountName) {
         String canonicalName = canonicalizeName(accountName);
@@ -262,8 +266,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * Use the asynchronous version below instead. See http://crbug.com/517697.
-     * @deprecated
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public boolean hasAccountForName(String accountName) {
         return getAccountFromName(accountName) != null;
@@ -282,7 +287,9 @@ public class AccountManagerHelper {
     }
 
     /**
-     * @return Whether or not there is an account authenticator for Google accounts.
+     * This method is deprecated; please use the asynchronous version below instead.
+     *
+     * See http://crbug.com/517697 for details.
      */
     public boolean hasGoogleAccountAuthenticator() {
         AuthenticatorDescription[] descs = mAccountManager.getAuthenticatorTypes();