Use GoogleApiAvailability#isGooglePlayServicesAvailable directly

since it's now available in the SDK.

Bug: 1057100
Change-Id: I10c867cdc40ab0a5d7eb41b6892d1220e1ee23dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354561
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798965}

chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java

@@ -18,7 +18,6 @@ import org.chromium.base.SysUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.media.router.caf.CafMediaRouteProvider;
 import org.chromium.chrome.browser.media.router.caf.remoting.CafRemotingMediaRouteProvider;
 
@@ -41,7 +40,8 @@ public class ChromeMediaRouter implements MediaRouteManager {
                 @Override
                 public void addProviders(MediaRouteManager manager) {
                     int googleApiAvailabilityResult =
-                            AppHooks.get().isGoogleApiAvailableWithMinApkVersion(
+                            GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+                                    ContextUtils.getApplicationContext(),
                                     MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
                     if (googleApiAvailabilityResult != ConnectionResult.SUCCESS) {
                         GoogleApiAvailability.getInstance().showErrorNotification(

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java

@@ -7,7 +7,9 @@ package org.chromium.chrome.browser.password_manager;
 import android.app.Activity;
 
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.AppHooks;
@@ -98,7 +100,9 @@ public class PasswordManagerLauncher {
         int minGooglePlayServicesVersion = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                 GOOGLE_ACCOUNT_PWM_UI, MIN_GOOGLE_PLAY_SERVICES_VERSION_PARAM,
                 DEFAULT_MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
-        if (AppHooks.get().isGoogleApiAvailableWithMinApkVersion(minGooglePlayServicesVersion)
+
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+                    ContextUtils.getApplicationContext(), minGooglePlayServicesVersion)
                 != ConnectionResult.SUCCESS) {
             return false;
         }