diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-03 13:32:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 14:31:55 +0200 |
| commit | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch) | |
| tree | 91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/components/browser_sync | |
| parent | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff) | |
| download | qtwebengine-chromium-21ba0c5d4bf8fba15dddd97cd693bad2358b77fd.tar.gz | |
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/components/browser_sync')
4 files changed, 6 insertions, 5 deletions
diff --git a/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc b/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc index 20e72ad1847..5a3b546a85f 100644 --- a/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc +++ b/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc @@ -14,6 +14,7 @@ #include "base/test/simple_test_clock.h" #include "base/time/time.h" #include "components/browser_sync/browser_sync_switches.h" +#include "components/sync/protocol/sync_enums.pb.h" #include "components/sync_device_info/device_info_util.h" #include "components/sync_device_info/fake_device_info_tracker.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +40,7 @@ std::unique_ptr<DeviceInfo> CreateFakeDeviceInfo( last_updated_timestamp, base::TimeDelta::FromMinutes(kPulseIntervalMinutes), /*send_tab_to_self_receiving_enabled=*/false, - /*sharing_info=*/base::nullopt, /*paask_info=*/base::nullopt, + /*sharing_info=*/absl::nullopt, /*paask_info=*/absl::nullopt, fcm_registration_token, /*interested_data_types=*/syncer::ModelTypeSet()); } diff --git a/chromium/components/browser_sync/browser_sync_switches.h b/chromium/components/browser_sync/browser_sync_switches.h index 32345cdaaf7..7baea7fc4ea 100644 --- a/chromium/components/browser_sync/browser_sync_switches.h +++ b/chromium/components/browser_sync/browser_sync_switches.h @@ -6,6 +6,7 @@ #define COMPONENTS_BROWSER_SYNC_BROWSER_SYNC_SWITCHES_H_ #include "base/feature_list.h" +#include "base/metrics/field_trial_params.h" #include "build/build_config.h" namespace switches { diff --git a/chromium/components/browser_sync/profile_sync_components_factory_impl.cc b/chromium/components/browser_sync/profile_sync_components_factory_impl.cc index f93914effcc..e55b1882cb0 100644 --- a/chromium/components/browser_sync/profile_sync_components_factory_impl.cc +++ b/chromium/components/browser_sync/profile_sync_components_factory_impl.cc @@ -430,8 +430,7 @@ ProfileSyncComponentsFactoryImpl::CreateSyncEngine( base::Unretained(sync_client_))); } -void ProfileSyncComponentsFactoryImpl:: - ClearAllTransportDataExceptEncryptionBootstrapToken() { +void ProfileSyncComponentsFactoryImpl::ClearAllTransportData() { syncer::SyncTransportDataPrefs sync_transport_data_prefs( sync_client_->GetPrefService()); @@ -448,7 +447,7 @@ void ProfileSyncComponentsFactoryImpl:: sync_client_->GetModelTypeStoreService()->GetSyncDataPath())); } - sync_transport_data_prefs.ClearAllExceptEncryptionBootstrapToken(); + sync_transport_data_prefs.ClearAll(); sync_client_->OnLocalSyncTransportDataCleared(); } diff --git a/chromium/components/browser_sync/profile_sync_components_factory_impl.h b/chromium/components/browser_sync/profile_sync_components_factory_impl.h index e3f28deb9a6..0379c5d6b4e 100644 --- a/chromium/components/browser_sync/profile_sync_components_factory_impl.h +++ b/chromium/components/browser_sync/profile_sync_components_factory_impl.h @@ -82,7 +82,7 @@ class ProfileSyncComponentsFactoryImpl const std::string& name, invalidation::InvalidationService* invalidator, syncer::SyncInvalidationsService* sync_invalidation_service) override; - void ClearAllTransportDataExceptEncryptionBootstrapToken() override; + void ClearAllTransportData() override; private: // Factory function for ModelTypeController instances for models living on |