BASELINE: Update Chromium to 87.0.4280.67

Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 18 deletions

diff --git a/chromium/components/sync_device_info/local_device_info_provider_impl.h b/chromium/components/sync_device_info/local_device_info_provider_impl.h
index 73a020c31a3..f0fd5fa66e2 100644
--- a/chromium/components/sync_device_info/local_device_info_provider_impl.h
+++ b/chromium/components/sync_device_info/local_device_info_provider_impl.h
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "components/sync/invalidations/fcm_registration_token_observer.h"
+#include "components/sync/base/model_type.h"
 #include "components/sync_device_info/device_info.h"
 #include "components/sync_device_info/local_device_info_provider.h"
 #include "components/version_info/version_info.h"
@@ -20,19 +20,12 @@
 namespace syncer {
 
 class DeviceInfoSyncClient;
-class SyncInvalidationsService;
 
-class LocalDeviceInfoProviderImpl
-    : public MutableLocalDeviceInfoProvider,
-      public syncer::FCMRegistrationTokenObserver {
+class LocalDeviceInfoProviderImpl : public MutableLocalDeviceInfoProvider {
  public:
-  // |sync_invalidations_service| is used to get an FCM registration token. It
-  // may be nullptr if sync invalidations are disabled.
-  LocalDeviceInfoProviderImpl(
-      version_info::Channel channel,
-      const std::string& version,
-      const DeviceInfoSyncClient* sync_client,
-      SyncInvalidationsService* sync_invalidations_service);
+  LocalDeviceInfoProviderImpl(version_info::Channel channel,
+                              const std::string& version,
+                              const DeviceInfoSyncClient* sync_client);
   ~LocalDeviceInfoProviderImpl() override;
 
   // MutableLocalDeviceInfoProvider implementation.
@@ -47,12 +40,7 @@ class LocalDeviceInfoProviderImpl
   std::unique_ptr<Subscription> RegisterOnInitializedCallback(
       const base::RepeatingClosure& callback) override;
 
-  // syncer::FCMRegistrationTokenObserver implementation.
-  void OnFCMRegistrationTokenChanged() override;
-
  private:
-  std::string GetFCMRegistrationToken() const;
-
   // The channel (CANARY, DEV, BETA, etc.) of the current client.
   const version_info::Channel channel_;
 
@@ -60,7 +48,6 @@ class LocalDeviceInfoProviderImpl
   const std::string version_;
 
   const DeviceInfoSyncClient* const sync_client_;
-  SyncInvalidationsService* sync_invalidations_service_ = nullptr;
 
   std::unique_ptr<DeviceInfo> local_device_info_;
   base::CallbackList<void(void)> callback_list_;