Rename MockAccountManager to FakeAccountManagerDelegate

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

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
index 0c544fac6022f5efca6782ada1d38ddc0ba2bc40..26e97c351daa9bba60c8c6ed35b5c73852a65929 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
@@ -17,7 +17,7 @@ import android.text.TextUtils;
 
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.signin.test.util.AccountHolder;
-import org.chromium.components.signin.test.util.MockAccountManager;
+import org.chromium.components.signin.test.util.FakeAccountManagerDelegate;
 
 import java.io.IOException;
 
@@ -34,7 +34,7 @@ public class ChromeSigninUtils {
     private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
 
     private AccountManager mAccountManager;
-    private MockAccountManager mMockAccountManager;
+    private FakeAccountManagerDelegate mFakeAccountManagerDelegate;
     private Context mContext;
     private Context mTargetContext;
 
@@ -48,7 +48,7 @@ public class ChromeSigninUtils {
         mContext = instrumentation.getContext();
         mTargetContext = instrumentation.getTargetContext();
         mAccountManager = AccountManager.get(mTargetContext);
-        mMockAccountManager = new MockAccountManager(mContext, mTargetContext);
+        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate(mContext);
     }
 
     /**
@@ -76,17 +76,18 @@ public class ChromeSigninUtils {
         }
 
         Account account = new Account(username, GOOGLE_ACCOUNT_TYPE);
-        mMockAccountManager = new MockAccountManager(mContext, mTargetContext, account);
+        mFakeAccountManagerDelegate = new FakeAccountManagerDelegate(mContext, account);
         AccountHolder accountHolder = AccountHolder.builder(account).password(password).build();
-        mMockAccountManager.addAccountHolderExplicitly(accountHolder);
+        mFakeAccountManagerDelegate.addAccountHolderExplicitly(accountHolder);
     }
 
     /**
      * Removes all fake accounts from the OS.
      */
     public void removeAllFakeAccountsFromOs() {
-        for (Account acct : mMockAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
-            mMockAccountManager.removeAccountHolderExplicitly(AccountHolder.builder(acct).build());
+        for (Account acct : mFakeAccountManagerDelegate.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
+            mFakeAccountManagerDelegate.removeAccountHolderExplicitly(
+                    AccountHolder.builder(acct).build());
         }
     }
 
@@ -97,11 +98,11 @@ public class ChromeSigninUtils {
      * @return {@code true} if fake account is on OS, false otherwise.
      */
     public boolean isExistingFakeAccountOnOs(String username) {
-        if (mMockAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE).length == 0) {
+        if (mFakeAccountManagerDelegate.getAccountsByType(GOOGLE_ACCOUNT_TYPE).length == 0) {
             return false;
         }
 
-        for (Account acct : mMockAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
+        for (Account acct : mFakeAccountManagerDelegate.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
             if (username.equals(acct.name)) {
                 return true;
             }