From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 3 May 2020 12:15:33 +0200
Subject: Remove google_services_gcm

---
 .../browser/language/AppLocaleUtils.java      | 32 +------------------
 third_party/android_deps/BUILD.gn             | 20 +-----------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
@@ -8,11 +8,6 @@ import android.content.Context;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
-import com.google.android.play.core.splitcompat.SplitCompat;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
-
 import org.chromium.base.BundleUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
@@ -78,31 +73,12 @@ public class AppLocaleUtils {
      * @param context Activity context to enable downloaded language splits on.
      */
     public static void maybeInstallActivitySplitCompat(Context context) {
-        if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) {
-            Log.i(TAG, "maybeInstallActivitySplit isOverridden: %s  isBundle: %s",
-                    GlobalAppLocaleController.getInstance().isOverridden(), BundleUtils.isBundle());
-            Log.i(TAG, "Override Locale: %s", getAppLanguagePref());
-            logInstalledLanguages(context);
-            SplitCompat.installActivity(context);
-            logInstalledLanguages(context);
-        }
     }
 
     /**
      * For bundle builds ensure that the language split for languageName is download.
      */
     private static void ensureLaguageSplitInstalled(String languageName) {
-        SplitInstallManager splitInstallManager =
-                SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
-
-        // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806
-        if (languageName != null) {
-            SplitInstallRequest installRequest =
-                    SplitInstallRequest.newBuilder()
-                            .addLanguage(Locale.forLanguageTag(languageName))
-                            .build();
-            splitInstallManager.startInstall(installRequest);
-        }
     }
 
     /**
@@ -110,12 +86,6 @@ public class AppLocaleUtils {
      * @param context Context to log installed languages on.
      */
     private static void logInstalledLanguages(Context context) {
-        if (BundleUtils.isBundle()) {
-            SplitInstallManager splitInstallManager = SplitInstallManagerFactory.create(context);
-            Log.i(TAG, "Installed Languages: %s",
-                    TextUtils.join(", ", splitInstallManager.getInstalledLanguages()));
-        } else {
-            Log.i(TAG, "Installed Languages: None - not a bundle");
-        }
+        Log.i(TAG, "Installed Languages: None - feature disabled");
     }
 }
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
@@ -81,7 +81,7 @@ java_annotation_processor("dagger_processor") {
 
 android_library("chromium_play_services_availability_java") {
   sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
-  deps = [ "$google_play_services_package:google_play_services_base_java" ]
+  deps = [ ]
 }
 
 android_library("chromium_play_services_availability_shadows_java") {
@@ -1135,24 +1135,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
   ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_gcm_java") {
-  aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar"
-  info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
-  deps = [
-    ":androidx_collection_collection_java",
-    ":androidx_core_core_java",
-    ":androidx_legacy_legacy_support_core_utils_java",
-    ":google_play_services_base_java",
-    ":google_play_services_basement_java",
-    ":google_play_services_iid_java",
-    ":google_play_services_stats_java",
-  ]
-
-  # Removing drawables from GMS .aars as they are unused bloat.
-  strip_drawables = true
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("com_google_android_material_material_java") {
   aar_path =
-- 
2.17.1