[Android][Signin] Inline the method AccountManagerFacade.hasAccountForName

This CL inlines the rarely used method
AccountManagerFacade.hasAccountForName to simplify the
AccountManagerFacade API.

Bug: 1057040
Change-Id: I6f1e37f1fde574bc561db9efe16e134924191118
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146551Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759270}

components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java

@@ -262,15 +262,6 @@ public class AccountManagerFacade {
         return null;
     }
 
-    /**
-     * Returns whether an account exists with the given name.
-     * Returns false if an error occurs while getting account list.
-     */
-    @AnyThread
-    public boolean hasAccountForName(String accountName) {
-        return getAccountFromName(accountName) != null;
-    }
-
     /**
      * @return Whether or not there is an account authenticator for Google accounts.
      */

components/signin/core/browser/android/junit/src/org/chromium/components/signin/test/AccountManagerFacadeRobolectricTest.java

@@ -88,9 +88,9 @@ public class AccountManagerFacadeRobolectricTest {
     public void testCanonicalAccount() {
         addTestAccount("test@gmail.com");
 
-        Assert.assertTrue(mFacade.hasAccountForName("test@gmail.com"));
-        Assert.assertTrue(mFacade.hasAccountForName("Test@gmail.com"));
-        Assert.assertTrue(mFacade.hasAccountForName("te.st@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("test@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("Test@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("te.st@gmail.com"));
     }
 
     // If this test starts flaking, please re-open crbug.com/568636 and make sure there is some sort
@@ -100,10 +100,10 @@ public class AccountManagerFacadeRobolectricTest {
     public void testNonCanonicalAccount() {
         addTestAccount("test.me@gmail.com");
 
-        Assert.assertTrue(mFacade.hasAccountForName("test.me@gmail.com"));
-        Assert.assertTrue(mFacade.hasAccountForName("testme@gmail.com"));
-        Assert.assertTrue(mFacade.hasAccountForName("Testme@gmail.com"));
-        Assert.assertTrue(mFacade.hasAccountForName("te.st.me@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("test.me@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("testme@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("Testme@gmail.com"));
+        Assert.assertNotNull(mFacade.getAccountFromName("te.st.me@gmail.com"));
     }
 
     @Test

components/signin/public/android/DEPS

@@ -8,7 +8,6 @@ specific_include_rules = {
   "ProfileOAuth2TokenServiceDelegate.java": [
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountTrackerService.java",
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacade.java",
-    "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/AuthException.java",
     "+components/signin/core/browser/android/java/src/org/chromium/components/signin/ChromeSigninController.java",
   ],

components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java

@@ -18,7 +18,6 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.components.signin.AccountManagerFacade;
-import org.chromium.components.signin.AccountManagerFacadeProvider;
 import org.chromium.components.signin.AccountTrackerService;
 import org.chromium.components.signin.AuthException;
 import org.chromium.net.NetworkChangeNotifier;
@@ -275,7 +274,7 @@ public final class ProfileOAuth2TokenServiceDelegate
         // ProfileOAuth2TokenServiceDelegate which is expected to be called in the UI thread
         // synchronously.
         try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) {
-            return AccountManagerFacadeProvider.getInstance().hasAccountForName(accountName);
+            return mAccountManagerFacade.getAccountFromName(accountName) != null;
         }
     }