Remove unused play services Chrome switches

These switches are no longer used by internal testing so they can be
removed. This also removes ExternalAuthUtils' dependency on chrome.

Bug: 1145663
Change-Id: I5ee1468bd78bd9bd7b3b0bf041aed214bb5e6016
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518803Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Liquan (Max) Gu <maxlg@chromium.org>
Commit-Queue: Nick Burris <nburris@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825034}

chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java

@@ -18,12 +18,10 @@ import androidx.annotation.WorkerThread;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.StrictModeContext;
 import org.chromium.base.task.PostTask;
-import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.gms.ChromiumPlayServicesAvailability;
@@ -176,11 +174,6 @@ public class ExternalAuthUtils {
      * @return true if and only if Google Play Services can be used
      */
     public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) {
-        if (CommandLine.getInstance().hasSwitch(
-                    ChromeSwitches.DISABLE_GOOGLE_PLAY_SERVICES_FOR_TESTING)) {
-            return false;
-        }
-
         Context context = ContextUtils.getApplicationContext();
         final int resultCode = checkGooglePlayServicesAvailable(context);
         if (resultCode == ConnectionResult.SUCCESS) return true;
@@ -226,10 +219,6 @@ public class ExternalAuthUtils {
     @WorkerThread
     public boolean canUseFirstPartyGooglePlayServices(
             UserRecoverableErrorHandler userRecoverableErrorHandler) {
-        if (CommandLine.getInstance().hasSwitch(
-                    ChromeSwitches.DISABLE_FIRST_PARTY_GOOGLE_PLAY_SERVICES_FOR_TESTING)) {
-            return false;
-        }
         return canUseGooglePlayServices(userRecoverableErrorHandler) && isChromeGoogleSigned();
     }
 

chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl

@@ -174,14 +174,6 @@ public abstract class ChromeSwitches {{
      */
     public static final String ENABLE_INCOGNITO_CUSTOM_TABS = "enable-incognito-custom-tabs";
 
-    /** Prevents use of first-party Google Play Services. */
-    public static final String DISABLE_FIRST_PARTY_GOOGLE_PLAY_SERVICES_FOR_TESTING =
-            "disable-first-party-google-play-services-for-testing";
-
-    /** Prevents use of Google Play Services. */
-    public static final String DISABLE_GOOGLE_PLAY_SERVICES_FOR_TESTING =
-            "disable-google-play-services-for-testing";
-
     /** Force enable special user handling. */
     public static final String FORCE_ENABLE_SPECIAL_USER = "force-enable-special-user";