Move GET_ACCOUNTS permission check to AccountManagerDelegate

Currently the AccountManagerHelper always checks the GET_ACCOUNTS
permission. This should instead be done directly by the
AccountManagerDelegate.

BUG=509826

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

Cr-Commit-Position: refs/heads/master@{#339710}
(cherry picked from commit 8fa468ef1d57bf34a0fd81c33a8866536e04f58a)

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

Cr-Commit-Position: refs/branch-heads/2403@{#541}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}

2 files changed, 5 insertions, 1 deletions

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 bdb350e..ce0a333 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -148,7 +148,6 @@ public class AccountManagerHelper {
      * @return an array of accounts.
      */
     public Account[] getGoogleAccounts() {
-        if (!hasGetAccountsPermission()) return new Account[]{};
         return mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
     }
 
diff --git a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
index 715498e..e0dc3de 100644
--- a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
@@ -20,13 +20,18 @@ import android.os.Handler;
 public class SystemAccountManagerDelegate implements AccountManagerDelegate {
 
     private final AccountManager mAccountManager;
+    private final Context mApplicationContext;
 
     public SystemAccountManagerDelegate(Context context) {
+        mApplicationContext = context.getApplicationContext();
         mAccountManager = AccountManager.get(context.getApplicationContext());
     }
 
     @Override
     public Account[] getAccountsByType(String type) {
+        if (!AccountManagerHelper.get(mApplicationContext).hasGetAccountsPermission()) {
+            return new Account[]{};
+        }
         return mAccountManager.getAccountsByType(type);
     }