Change AccountManagerHelper initialization

chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java

 // Copyright 2015 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.test.util;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
@@ skipping 17 matching lines @@
     /** Bundle tags */
     private static final String USERNAME = "username";
     private static final String PASSWORD = "password";
     private static final String ALLOW_SKIP = "allowSkip";
 
     /** Information for Google OS account */
     private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
 
     private AccountManager mAccountManager;
     private FakeAccountManagerDelegate mFakeAccountManagerDelegate;
-    private Context mContext;
     private Context mTargetContext;
 
     /**
      * The constructor for SigninUtils for a given test case.
      *
      * @param instrumentation the {@link android.app.Instrumentation} to perform signin operations
      * with.
      */
     public ChromeSigninUtils(Instrumentation instrumentation) {
-        mContext = instrumentation.getContext();
         mTargetContext = instrumentation.getTargetContext();
         mAccountManager = AccountManager.get(mTargetContext);
-        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate(mContext);
+        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate();
     }
 
     /**
      * Adds an account to the app.
      *
      * @param username the username for the logged in account; must be a Google account.
      */
     public void addAccountToApp(String username) {
         if (TextUtils.isEmpty(username)) {
             throw new IllegalArgumentException("ERROR: must specify account");
         }
 
         if (ChromeSigninController.get().isSignedIn()) {
             ChromeSigninController.get().setSignedInAccountName(null);
         }
         ChromeSigninController.get().setSignedInAccountName(username);
     }
 
     /**
      * Adds a fake account to the OS.
      */
     public void addFakeAccountToOs(String username, String password) {
         if (TextUtils.isEmpty(username)) {
             throw new IllegalArgumentException("ERROR: must specify account");
         }
 
         Account account = new Account(username, GOOGLE_ACCOUNT_TYPE);
-        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate(mContext, account);
+        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate(account);
         AccountHolder accountHolder = AccountHolder.builder(account).password(password).build();
         mFakeAccountManagerDelegate.addAccountHolderExplicitly(accountHolder);
     }
 
     /**
      * Removes all fake accounts from the OS.
      */
     public void removeAllFakeAccountsFromOs() {
         for (Account acct : mFakeAccountManagerDelegate.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
             mFakeAccountManagerDelegate.removeAccountHolderExplicitly(
@@ skipping 131 matching lines @@
          */
         private Bundle buildExceptionBundle(Exception e) {
             Bundle bundle = new Bundle();
             bundle.putInt(AccountManager.KEY_ERROR_CODE,
                     AccountManager.ERROR_CODE_INVALID_RESPONSE);
             bundle.putString(AccountManager.KEY_ERROR_MESSAGE, e.toString());
             return bundle;
         }
     }
 }