Revert of Android: Remove GetApplicationContext part 2

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.support.test.filters.LargeTest;
 
@@ skipping 106 matching lines @@
 
                 // Tell the fake content resolver that a rename had happen and copy over the sync
                 // settings. This would normally be done by the SystemSyncContentResolver.
                 mSyncContentResolver.renameAccounts(
                         oldAccount, newAccount, AndroidSyncSettings.getContractAuthority(mContext));
 
                 // Inform the AccountTracker, these would normally be done by account validation
                 // 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(accountNames[0]),
-                        provider.getAccountId(accountNames[1])};
-                AccountTrackerService.get().syncForceRefreshForTest(accountIds, accountNames);
+                String[] accountIds = {provider.getAccountId(mContext, accountNames[0]),
+                                       provider.getAccountId(mContext, accountNames[1])};
+                AccountTrackerService.get(mContext).syncForceRefreshForTest(
+                        accountIds, accountNames);
 
                 // Starts the rename process. Normally, this is triggered by the broadcast
                 // listener as well.
                 SigninHelper.get(mContext).validateAccountSettings(true);
             }
         });
 
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ skipping 64 matching lines @@
 
         mSyncContentResolver.setMasterSyncAutomatically(false);
         startSync();
         assertFalse(SyncTestUtil.isSyncRequested());
     }
 
     private static ContentViewCore getContentViewCore(ChromeActivity activity) {
         return activity.getActivityTab().getContentViewCore();
     }
 }