Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java
index 7e0582dda22cc351eb77fd838e2c9ba619954b86..9827a46f9d8cd096cb50eb3748751499d0950cfb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java
@@ -51,6 +51,16 @@ public final class AndroidProfileOAuth2TokenServiceHelper {
     }
 
     /**
+     * Called by native to list the accounts with OAuth2 refresh tokens.
+     */
+    @CalledByNative
+    public static String[] getAccounts(Context context) {
+        AccountManagerHelper accountManagerHelper = AccountManagerHelper.get(context);
+        List<String> accountNames = accountManagerHelper.getGoogleAccountNames();
+        return accountNames.toArray(new String[accountNames.size()]);
+    }
+
+    /**
      * Called by native to retrieve OAuth2 tokens.
      *
      * @param username The native username (full address).
@@ -136,6 +146,15 @@ public final class AndroidProfileOAuth2TokenServiceHelper {
     }
 
     /**
+     * Called by native to check wether the account has an OAuth2 refresh token.
+     */
+    @CalledByNative
+    public static boolean hasOAuth2RefreshToken(Context context, String accountName) {
+        AccountManagerHelper accountManagerHelper = AccountManagerHelper.get(context);
+        return accountManagerHelper.getAccountForName(accountName) != null;

[nyquist, 2013/08/31 17:51:10]

Could you extract this to a new method in AccountManagerHelper?

public boolean hasAccountForName(String accountName) {
  return getAccountForName(accountName) != null;
}

And then call that method from here?

[fgorski, 2013/09/03 20:50:40]

Done.

+    }
+
+    /**
     * Called by native to invalidate an OAuth2 token.
     */
     @CalledByNative