Reland "Android: Remove GetApplicationContext part 2"

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
index 8579213637b6ee1fa59a6f06871fd680454abcc3..9a3e8cd9b1422fde140cd11a0238e75a836aa9cf 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -124,10 +124,9 @@ public class SyncTest extends SyncTestBase {
                 // or signin. We will only be calling the testing versions of it.
                 AccountIdProvider provider = AccountIdProvider.getInstance();
                 String[] accountNames = {oldAccount.name, newAccount.name};
-                String[] accountIds = {provider.getAccountId(mContext, accountNames[0]),
-                                       provider.getAccountId(mContext, accountNames[1])};
-                AccountTrackerService.get(mContext).syncForceRefreshForTest(
-                        accountIds, accountNames);
+                String[] accountIds = {provider.getAccountId(accountNames[0]),
+                        provider.getAccountId(accountNames[1])};
+                AccountTrackerService.get().syncForceRefreshForTest(accountIds, accountNames);
 
                 // Starts the rename process. Normally, this is triggered by the broadcast
                 // listener as well.