Remove-gcm-driver-java.patch

From: Your Name <you@example.com>
Date: Sat, 23 Jul 2022 15:00:29 +0000
Subject: Remove gcm_driver_java

---
 BUILD.gn                                      |  2 -
 .../java/src/org/chromium/base/BuildInfo.java |  6 ---
 chrome/android/BUILD.gn                       |  2 -
 chrome/android/java/AndroidManifest.xml       | 15 ------
 .../firstrun/FirstRunAppRestrictionInfo.java  |  1 +
 chrome/browser/BUILD.gn                       |  2 -
 .../instance_id_profile_service_factory.cc    | 14 +----
 .../profile_invalidation_provider_factory.cc  | 20 +------
 .../policy/cloud/cloud_policy_invalidator.cc  |  2 +-
 .../push_messaging_service_impl.cc            |  6 +--
 .../sharing/sharing_service_factory.cc        |  5 +-
 .../sync_invalidations_service_factory.cc     | 15 +-----
 chrome/browser/sync/sync_service_factory.cc   |  1 -
 .../webauthn/android/cable_module_android.cc  |  1 +
 components/BUILD.gn                           |  1 -
 components/gcm_driver/BUILD.gn                |  7 ---
 components/gcm_driver/android/BUILD.gn        |  2 +
 components/gcm_driver/gcm_client_impl.cc      |  8 +--
 .../gcm_driver/instance_id/android/BUILD.gn   |  1 -
 .../instance_id/InstanceIDBridge.java         | 23 --------
 .../signin/ChildAccountInfoFetcher.java       |  4 +-
 google_apis/gcm/BUILD.gn                      | 53 -------------------
 22 files changed, 18 insertions(+), 173 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -113,7 +113,6 @@ group("gn_all") {
   if (!is_android && !is_chromecast) {
     deps += [
       "//crypto:crypto_unittests",
-      "//google_apis/gcm:gcm_unit_tests",
     ]
   }
 
@@ -240,7 +239,6 @@ group("gn_all") {
 
   if (!is_ios) {
     deps += [
-      "//google_apis/gcm:mcs_probe",
       "//media/cast:cast_unittests",
       "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
     ]
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
--- a/base/android/java/src/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
@@ -161,12 +161,6 @@ public class BuildInfo {
             installerPackageName = nullToEmpty(pm.getInstallerPackageName(packageName));
 
             PackageInfo gmsPackageInfo = null;
-            try {
-                gmsPackageInfo = pm.getPackageInfo("com.google.android.gms", 0);
-            } catch (NameNotFoundException e) {
-                // TODO(b/197112084): Re-enable the logging
-                // Log.d(TAG, "GMS package is not found.");
-            }
             gmsVersionCode = gmsPackageInfo != null
                     ? String.valueOf(packageVersionCode(gmsPackageInfo))
                     : "gms versionCode not available.";
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -499,7 +499,6 @@ android_library("chrome_java") {
     "//components/feed/core/proto:proto_java_v2",
     "//components/feed/core/v2:feedv2_core_java",
     "//components/find_in_page/android:java",
-    "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
     "//components/image_fetcher:java",
     "//components/infobars/android:infobar_android_enums_java",
@@ -1507,7 +1506,6 @@ android_library("chrome_test_java") {
     "//components/favicon/android:java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/feed/core/v2:feedv2_core_java",
-    "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
     "//components/image_fetcher:java",
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -831,21 +831,6 @@ by a child template that "extends" this file.
             </intent-filter>
         </activity>
 
-        <!-- configChanges is set here to prevent the destruction of the
-             activity after configuration changes. Since the bulk of this
-             activity's logic is in a feature module, restoring the activity
-             via a Bundle doesn't work. -->
-        <activity
-        android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity"
-        android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
-        android:theme="@style/Theme.Chromium.Activity.Fullscreen"
-        android:label="@string/cablev2_activity_title"
-        android:permission="com.google.android.gms.auth.cryptauth.permission.CABLEV2_SERVER_LINK"
-        android:exported="true"
-        android:excludeFromRecents="true"
-        android:launchMode="singleTop">
-        </activity>
-
         <!-- configChanges is set here to prevent the destruction of the
              activity after configuration changes. Since the bulk of this
              activity's logic is in a feature module, restoring the activity
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfo.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfo.java
@@ -133,6 +133,7 @@ class FirstRunAppRestrictionInfo {
      * Start fetching app restriction on an async thread.
      */
     private void initialize() {
+        if ((true)) return;
         ThreadUtils.assertOnUiThread();
         long startTime = SystemClock.elapsedRealtime();
 
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -553,8 +553,6 @@ static_library("browser") {
     "font_pref_change_notifier_factory.h",
     "gcm/gcm_product_util.cc",
     "gcm/gcm_product_util.h",
-    "gcm/gcm_profile_service_factory.cc",
-    "gcm/gcm_profile_service_factory.h",
     "gcm/instance_id/instance_id_profile_service_factory.cc",
     "gcm/instance_id/instance_id_profile_service_factory.h",
     "geolocation/geolocation_permission_context_delegate.cc",
diff --git a/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc b/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
--- a/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
+++ b/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
@@ -18,12 +18,7 @@ namespace instance_id {
 // static
 InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile(
     content::BrowserContext* profile) {
-  // Instance ID is not supported in incognito mode.
-  if (profile->IsOffTheRecord())
-    return NULL;
-
-  return static_cast<InstanceIDProfileService*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
+  return NULL;
 }
 
 // static
@@ -36,8 +31,6 @@ InstanceIDProfileServiceFactory::InstanceIDProfileServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "InstanceIDProfileService",
         BrowserContextDependencyManager::GetInstance()) {
-  // GCM is needed for device ID.
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
 }
 
 InstanceIDProfileServiceFactory::~InstanceIDProfileServiceFactory() {
@@ -45,10 +38,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileServiceFactory() {
 
 KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  Profile* profile = Profile::FromBrowserContext(context);
-  return new InstanceIDProfileService(
-      gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
-      profile->IsOffTheRecord());
+  return nullptr;
 }
 
 content::BrowserContext*
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -48,23 +48,7 @@ std::unique_ptr<InvalidationService> CreateInvalidationServiceForSenderId(
     Profile* profile,
     IdentityProvider* identity_provider,
     const std::string& sender_id) {
-  auto service = std::make_unique<FCMInvalidationService>(
-      identity_provider,
-      base::BindRepeating(
-          &FCMNetworkHandler::Create,
-          gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
-          instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
-              ->driver()),
-      base::BindRepeating(
-          &PerUserTopicSubscriptionManager::Create, identity_provider,
-          profile->GetPrefs(),
-          base::RetainedRef(profile->GetDefaultStoragePartition()
-                                ->GetURLLoaderFactoryForBrowserProcess())),
-      instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
-          ->driver(),
-      profile->GetPrefs(), sender_id);
-  service->Init();
-  return service;
+  return nullptr;
 }
 
 }  // namespace
@@ -99,8 +83,6 @@ ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
     : BrowserContextKeyedServiceFactory(
           "InvalidationService",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(IdentityManagerFactory::GetInstance());
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
 }
 
 ProfileInvalidationProviderFactory::~ProfileInvalidationProviderFactory() =
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
@@ -227,9 +227,9 @@ void CloudPolicyInvalidator::Initialize(
     invalidation::InvalidationService* invalidation_service) {
   DCHECK(state_ == UNINITIALIZED);
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(invalidation_service);
   invalidation_service_ = invalidation_service;
   state_ = STOPPED;
+  if ((true)) return;
   core_->AddObserver(this);
   if (core_->refresh_scheduler())
     OnRefreshSchedulerStarted(core_);
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
--- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -1654,11 +1654,7 @@ void PushMessagingServiceImpl::GetEncryptionInfoForAppId(
 }
 
 gcm::GCMDriver* PushMessagingServiceImpl::GetGCMDriver() const {
-  gcm::GCMProfileService* gcm_profile_service =
-      gcm::GCMProfileServiceFactory::GetForProfile(profile_);
-  CHECK(gcm_profile_service);
-  CHECK(gcm_profile_service->driver());
-  return gcm_profile_service->driver();
+  return nullptr;
 }
 
 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()
diff --git a/chrome/browser/sharing/sharing_service_factory.cc b/chrome/browser/sharing/sharing_service_factory.cc
--- a/chrome/browser/sharing/sharing_service_factory.cc
+++ b/chrome/browser/sharing/sharing_service_factory.cc
@@ -47,6 +47,7 @@ constexpr char kServiceName[] = "SharingService";
 // Removes old encryption info with empty authorized_entity to avoid DCHECK.
 // See http://crbug/987591
 void CleanEncryptionInfoWithoutAuthorizedEntity(gcm::GCMDriver* gcm_driver) {
+  if ((true)) return;
   gcm::GCMEncryptionProvider* encryption_provider =
       gcm_driver->GetEncryptionProviderInternal();
   if (!encryption_provider)
@@ -75,7 +76,6 @@ SharingServiceFactory::SharingServiceFactory()
     : BrowserContextKeyedServiceFactory(
           kServiceName,
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
   DependsOn(instance_id::InstanceIDProfileServiceFactory::GetInstance());
   DependsOn(DeviceInfoSyncServiceFactory::GetInstance());
   DependsOn(OptimizationGuideKeyedServiceFactory::GetInstance());
@@ -118,8 +118,7 @@ KeyedService* SharingServiceFactory::BuildServiceInstanceFor(
           ->GetURLLoaderFactoryForBrowserProcess());
   SharingMessageBridge* message_bridge =
       SharingMessageBridgeFactory::GetForBrowserContext(profile);
-  gcm::GCMDriver* gcm_driver =
-      gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver();
+  gcm::GCMDriver* gcm_driver = nullptr;
   CleanEncryptionInfoWithoutAuthorizedEntity(gcm_driver);
   syncer::LocalDeviceInfoProvider* local_device_info_provider =
       device_info_sync_service->GetLocalDeviceInfoProvider();
diff --git a/chrome/browser/sync/sync_invalidations_service_factory.cc b/chrome/browser/sync/sync_invalidations_service_factory.cc
--- a/chrome/browser/sync/sync_invalidations_service_factory.cc
+++ b/chrome/browser/sync/sync_invalidations_service_factory.cc
@@ -30,7 +30,6 @@ SyncInvalidationsServiceFactory::SyncInvalidationsServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "SyncInvalidationsService",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
   DependsOn(instance_id::InstanceIDProfileServiceFactory::GetInstance());
 }
 
@@ -38,17 +37,5 @@ SyncInvalidationsServiceFactory::~SyncInvalidationsServiceFactory() = default;
 
 KeyedService* SyncInvalidationsServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  if (!base::FeatureList::IsEnabled(syncer::kSyncSendInterestedDataTypes)) {
-    return nullptr;
-  }
-
-  Profile* profile = Profile::FromBrowserContext(context);
-
-  gcm::GCMDriver* gcm_driver =
-      gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver();
-  instance_id::InstanceIDDriver* instance_id_driver =
-      instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
-          ->driver();
-  return new syncer::SyncInvalidationsServiceImpl(gcm_driver,
-                                                  instance_id_driver);
+  return nullptr;
 }
diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
--- a/chrome/browser/sync/sync_service_factory.cc
+++ b/chrome/browser/sync/sync_service_factory.cc
@@ -223,7 +223,6 @@ SyncServiceFactory::SyncServiceFactory()
   DependsOn(ConsentAuditorFactory::GetInstance());
   DependsOn(DeviceInfoSyncServiceFactory::GetInstance());
   DependsOn(FaviconServiceFactory::GetInstance());
-  DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(IdentityManagerFactory::GetInstance());
   DependsOn(SyncInvalidationsServiceFactory::GetInstance());
diff --git a/chrome/browser/webauthn/android/cable_module_android.cc b/chrome/browser/webauthn/android/cable_module_android.cc
--- a/chrome/browser/webauthn/android/cable_module_android.cc
+++ b/chrome/browser/webauthn/android/cable_module_android.cc
@@ -63,6 +63,7 @@ const char kRootSecretPrefName[] = "webauthn.authenticator_root_secret";
 class RegistrationState {
  public:
   void Register() {
+    if ((true)) return;
     DCHECK(!linking_registration_);
     DCHECK(!sync_registration_);
 
diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -1025,7 +1025,6 @@ if (is_android) {
       "//components/content_capture/android/junit:components_content_capture_junit_tests",
       "//components/crash/android:junit",
       "//components/embedder_support/android:components_embedder_support_junit_tests",
-      "//components/gcm_driver/android:components_gcm_driver_junit_tests",
       "//components/image_fetcher:junit",
       "//components/installedapp/android:junit",
       "//components/language/android:junit",
diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn
--- a/components/gcm_driver/BUILD.gn
+++ b/components/gcm_driver/BUILD.gn
@@ -79,10 +79,6 @@ static_library("gcm_driver") {
   if (use_gcm_from_platform) {
     assert(is_android)
     sources += [
-      "gcm_driver_android.cc",
-      "gcm_driver_android.h",
-      "gcm_stats_recorder_android.cc",
-      "gcm_stats_recorder_android.h",
     ]
   } else {
     sources += [
@@ -110,9 +106,6 @@ static_library("gcm_driver") {
     ]
   }
 
-  if (is_android) {
-    deps += [ "android:jni_headers" ]
-  }
 }
 
 static_library("test_support") {
diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+UNUSED
+
 import("//build/config/android/rules.gni")
 
 generate_jni("jni_headers") {
diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -465,7 +465,7 @@ void GCMClientImpl::StartGCM() {
 
 void GCMClientImpl::InitializeMCSClient() {
   DCHECK(network_connection_tracker_);
-  return;
+  if ((true)) return;
   std::vector<GURL> endpoints;
   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -660,7 +660,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope,
                                          int interval_ms) {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
   DCHECK(mcs_client_);
-  return;
+  if ((true)) return;
   mcs_client_->AddHeartbeatInterval(scope, interval_ms);
 }
 
@@ -672,7 +672,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
 
 void GCMClientImpl::StartCheckin() {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-  return;
+  if ((true)) return;
 
   // Make sure no checkin is in progress.
   if (checkin_request_)
@@ -750,7 +750,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
 
 void GCMClientImpl::SchedulePeriodicCheckin() {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-  return;
+  if ((true)) return;
 
   // Make sure no checkin is in progress.
   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
@@ -18,7 +18,6 @@ android_library("instance_id_driver_java") {
     "//base:base_java",
     "//base:jni_java",
     "//build/android:build_java",
-    "//components/gcm_driver/android:gcm_driver_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
@@ -8,9 +8,6 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.task.AsyncTask;
-import org.chromium.components.gcm_driver.InstanceIDFlags;
-import org.chromium.components.gcm_driver.LazySubscriptionsManager;
-import org.chromium.components.gcm_driver.SubscriptionFlagManager;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -75,8 +72,6 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(String id) {
-                InstanceIDBridgeJni.get().didGetID(
-                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, id);
             }
         }.execute();
     }
@@ -91,8 +86,6 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Long creationTime) {
-                InstanceIDBridgeJni.get().didGetCreationTime(
-                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, creationTime);
             }
         }.execute();
     }
@@ -113,8 +106,6 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(String token) {
-                InstanceIDBridgeJni.get().didGetToken(
-                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, token);
             }
         }.execute();
     }
@@ -130,8 +121,6 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-                InstanceIDBridgeJni.get().didDeleteToken(
-                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, success);
             }
         }.execute();
     }
@@ -146,8 +135,6 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-                InstanceIDBridgeJni.get().didDeleteID(
-                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, success);
             }
         }.execute();
     }
@@ -197,15 +184,5 @@ public class InstanceIDBridge {
 
     @NativeMethods
     interface Natives {
-        void didGetID(
-                long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId, String id);
-        void didGetCreationTime(long nativeInstanceIDAndroid, InstanceIDBridge caller,
-                int requestId, long creationTime);
-        void didGetToken(
-                long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId, String token);
-        void didDeleteToken(long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId,
-                boolean success);
-        void didDeleteID(long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId,
-                boolean success);
     }
 }
diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java b/components/signin/public/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java
--- a/components/signin/public/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java
+++ b/components/signin/public/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java
@@ -28,10 +28,10 @@ final class ChildAccountInfoFetcher {
     private static final String TAG = "signin";
 
     private static final String ACCOUNT_SERVICES_CHANGED_FILTER =
-            "com.google.android.gms.auth.ACCOUNT_SERVICES_CHANGED";
+            "xx.com.google.android.gms.auth.ACCOUNT_SERVICES_CHANGED";
 
     private static final String ACCOUNT_CHANGE_PERMISSION =
-            "com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE";
+            "xx.com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE";
 
     private static final String ACCOUNT_KEY = "account";
 
diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn
--- a/google_apis/gcm/BUILD.gn
+++ b/google_apis/gcm/BUILD.gn
@@ -6,59 +6,6 @@ import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 component("gcm") {
-  sources = [
-    "base/gcm_constants.cc",
-    "base/gcm_constants.h",
-    "base/gcm_features.cc",
-    "base/gcm_features.h",
-    "base/gcm_util.cc",
-    "base/gcm_util.h",
-    "base/mcs_message.cc",
-    "base/mcs_message.h",
-    "base/mcs_util.cc",
-    "base/mcs_util.h",
-    "base/socket_stream.cc",
-    "base/socket_stream.h",
-    "engine/account_mapping.cc",
-    "engine/account_mapping.h",
-    "engine/checkin_request.cc",
-    "engine/checkin_request.h",
-    "engine/connection_event_tracker.cc",
-    "engine/connection_event_tracker.h",
-    "engine/connection_factory.cc",
-    "engine/connection_factory.h",
-    "engine/connection_factory_impl.cc",
-    "engine/connection_factory_impl.h",
-    "engine/connection_handler.cc",
-    "engine/connection_handler.h",
-    "engine/connection_handler_impl.cc",
-    "engine/connection_handler_impl.h",
-    "engine/gcm_registration_request_handler.cc",
-    "engine/gcm_registration_request_handler.h",
-    "engine/gcm_store.cc",
-    "engine/gcm_store.h",
-    "engine/gcm_store_impl.cc",
-    "engine/gcm_store_impl.h",
-    "engine/gcm_unregistration_request_handler.cc",
-    "engine/gcm_unregistration_request_handler.h",
-    "engine/gservices_settings.cc",
-    "engine/gservices_settings.h",
-    "engine/gservices_switches.cc",
-    "engine/gservices_switches.h",
-    "engine/heartbeat_manager.cc",
-    "engine/heartbeat_manager.h",
-    "engine/instance_id_delete_token_request_handler.cc",
-    "engine/instance_id_delete_token_request_handler.h",
-    "engine/instance_id_get_token_request_handler.cc",
-    "engine/instance_id_get_token_request_handler.h",
-    "engine/mcs_client.cc",
-    "engine/mcs_client.h",
-    "engine/registration_request.cc",
-    "engine/registration_request.h",
-    "engine/unregistration_request.cc",
-    "engine/unregistration_request.h",
-    "monitoring/gcm_stats_recorder.h",
-  ]
 
   defines = [ "GCM_IMPLEMENTATION" ]
 
--
2.25.1