From: Wengling Chen <feiyu2817@gmail.com>
Date: Sat, 2 Nov 2019 09:29:52 +0100
Subject: Remove dependency on com.google.android.gcm

---
 third_party/android_sdk/BUILD.gn              |  3 --
 .../client/android2/AndroidManifest.xml       | 35 -------------------
 .../AndroidMessageReceiverService.java        | 17 ---------
 .../channel/AndroidMessageSenderService.java  |  3 +-
 4 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/third_party/android_sdk/BUILD.gn b/third_party/android_sdk/BUILD.gn
--- a/third_party/android_sdk/BUILD.gn
+++ b/third_party/android_sdk/BUILD.gn
@@ -63,7 +63,4 @@ if (enable_java_templates) {
     testonly = true
     sources = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
   }
-  android_java_prebuilt("android_gcm_java") {
-    jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar"
-  }
 }
diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
@@ -4,10 +4,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.ipc.invalidation.client.android2">
 
-  <!-- App receives GCM messages. -->
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-  <!-- GCM connects to Google Services. -->
-  <uses-permission android:name="android.permission.INTERNET" />
   <!-- Keeps the processor from sleeping when a message is received. -->
   <uses-permission android:name="android.permission.WAKE_LOCK" />
 
@@ -16,40 +12,9 @@
     <service android:exported="false"
         android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/>
 
-    <!-- Ticl sender. -->
-    <service android:exported="false"
-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/>
-
     <!-- Receiver for scheduler alarms. -->
     <receiver android:exported="false"
         android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/>
 
-    <!-- GCM Broadcast Receiver -->
-    <receiver android:exported="true"
-        android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver"
-        android:permission="com.google.android.c2dm.permission.SEND">
-      <intent-filter>
-        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-        <category android:name="com.google.ipc.invalidation.ticl.android2" />
-      </intent-filter>
-    </receiver>
-
-    <!-- GCM multiplexer -->
-    <service android:exported="false"
-        android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener">
-      <meta-data android:name="sender_ids" android:value="ipc.invalidation@gmail.com"/>
-    </service>
-
-    <!-- Invalidation service multiplexed GCM receiver -->
-    <service android:exported="false"
-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService"
-        android:enabled="true"/>
-    <receiver android:exported="false"
-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver">
-      <intent-filter>
-        <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT" />
-      </intent-filter>
-    </receiver>
   </application>
 </manifest>
diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
@@ -15,7 +15,6 @@
  */
 package com.google.ipc.invalidation.ticl.android2.channel;
 
-import com.google.android.gcm.GCMRegistrar;
 import com.google.ipc.invalidation.external.client.SystemResources.Logger;
 import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
 import com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener;
@@ -126,20 +125,4 @@ public class AndroidMessageReceiverService extends MultiplexingGcmListener.Abstr
     // now, there is nothing to do.
   }
 
-  /**
-   * Initializes GCM as a convenience method for tests. In production, applications should handle
-   * this.
-   */
-  public static void initializeGcmForTest(Context context, Logger logger, String senderId) {
-    // Initialize GCM.
-    GCMRegistrar.checkDevice(context);
-    GCMRegistrar.checkManifest(context);
-    String regId = GCMRegistrar.getRegistrationId(context);
-    if (regId.isEmpty()) {
-      logger.info("Not registered with GCM; registering");
-      GCMRegistrar.register(context, senderId);
-    } else {
-      logger.fine("Already registered with GCM: %s", regId);
-    }
-  }
 }
diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
@@ -15,7 +15,6 @@
  */
 package com.google.ipc.invalidation.ticl.android2.channel;
 
-import com.google.android.gcm.GCMRegistrar;
 import com.google.ipc.invalidation.common.GcmSharedConstants;
 import com.google.ipc.invalidation.external.client.SystemResources.Logger;
 import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
@@ -395,7 +394,7 @@ public class AndroidMessageSenderService extends IntentService {
         // No client key when using old style registration id.
         clientKey = "";
         try {
-            registrationId = GCMRegistrar.getRegistrationId(context);
+        registrationId = null;
         } catch (RuntimeException exception) {
             // GCMRegistrar#getRegistrationId occasionally throws a runtime exception. Catching the
             // exception rather than crashing.
-- 
2.17.1