Reland "Android: Remove GetApplicationContext part 2"

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

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java
index 9a3fb476401f387cdab50501efb7e09f91312f96..f8f278cc8b60bf5054f585056348e0ba1d90e08e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
-import android.content.Context;
 import android.os.AsyncTask;
 
 import org.chromium.base.Callback;
@@ -30,8 +29,6 @@ public class AccountTrackerService {
     private boolean mSystemAccountsChanged;
     private boolean mSyncForceRefreshedForTest;
 
-    private final Context mContext;
-
     private enum SystemAccountsSeedingStatus {
         SEEDING_NOT_STARTED,
         SEEDING_IN_PROGRESS,
@@ -53,16 +50,15 @@ public class AccountTrackerService {
     private final ObserverList<OnSystemAccountsSeededListener> mSystemAccountsSeedingObservers =
             new ObserverList<>();
 
-    public static AccountTrackerService get(Context context) {
+    public static AccountTrackerService get() {
         ThreadUtils.assertOnUiThread();
         if (sAccountTrackerService == null) {
-            sAccountTrackerService = new AccountTrackerService(context);
+            sAccountTrackerService = new AccountTrackerService();
         }
         return sAccountTrackerService;
     }
 
-    private AccountTrackerService(Context context) {
-        mContext = context;
+    private AccountTrackerService() {
         mSystemAccountsSeedingStatus = SystemAccountsSeedingStatus.SEEDING_NOT_STARTED;
         mSystemAccountsChanged = false;
     }
@@ -111,13 +107,13 @@ public class AccountTrackerService {
         mSystemAccountsChanged = false;
         mSyncForceRefreshedForTest = false;
         final AccountIdProvider accountIdProvider = AccountIdProvider.getInstance();
-        if (accountIdProvider.canBeUsed(mContext)) {
+        if (accountIdProvider.canBeUsed()) {
             mSystemAccountsSeedingStatus = SystemAccountsSeedingStatus.SEEDING_IN_PROGRESS;
         } else {
             mSystemAccountsSeedingStatus = SystemAccountsSeedingStatus.SEEDING_NOT_STARTED;
             return;
         }
-        AccountManagerHelper.get(mContext).getGoogleAccounts(new Callback<Account[]>() {
+        AccountManagerHelper.get().getGoogleAccounts(new Callback<Account[]>() {
             @Override
             public void onResult(final Account[] accounts) {
                 new AsyncTask<Void, Void, String[][]>() {
@@ -127,7 +123,7 @@ public class AccountTrackerService {
                         String[][] accountIdNameMap = new String[2][accounts.length];
                         for (int i = 0; i < accounts.length; ++i) {
                             accountIdNameMap[0][i] =
-                                    accountIdProvider.getAccountId(mContext, accounts[i].name);
+                                    accountIdProvider.getAccountId(accounts[i].name);
                             accountIdNameMap[1][i] = accounts[i].name;
                         }
                         return accountIdNameMap;
@@ -203,7 +199,7 @@ public class AccountTrackerService {
         }
 
         mSystemAccountsSeedingStatus = SystemAccountsSeedingStatus.SEEDING_VALIDATING;
-        AccountManagerHelper.get(mContext).getGoogleAccounts(new Callback<Account[]>() {
+        AccountManagerHelper.get().getGoogleAccounts(new Callback<Account[]>() {
             @Override
             public void onResult(final Account[] accounts) {
                 if (mSystemAccountsChanged