| Index: components/password_manager/sync/browser/password_manager_setting_migrator_service.h
|
| diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
|
| index 14d35ce0680720e00d27896dd4b82031eaad4b72..797d11c90b64ad9db9699c4025ccb940ee89e2ca 100644
|
| --- a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
|
| +++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
|
| @@ -12,13 +12,13 @@
|
| #include "base/memory/singleton.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| -#include "components/syncable_prefs/pref_service_syncable_observer.h"
|
| +#include "components/sync_preferences/pref_service_syncable_observer.h"
|
|
|
| namespace syncer {
|
| class SyncService;
|
| }
|
|
|
| -namespace syncable_prefs {
|
| +namespace sync_preferences {
|
| class PrefServiceSyncable;
|
| }
|
|
|
| @@ -77,10 +77,10 @@ namespace password_manager {
|
| // depends on PrefServiceSyncable https://crbug.com/522536.
|
| class PasswordManagerSettingMigratorService
|
| : public KeyedService,
|
| - public syncable_prefs::PrefServiceSyncableObserver {
|
| + public sync_preferences::PrefServiceSyncableObserver {
|
| public:
|
| explicit PasswordManagerSettingMigratorService(
|
| - syncable_prefs::PrefServiceSyncable* prefs);
|
| + sync_preferences::PrefServiceSyncable* prefs);
|
| ~PasswordManagerSettingMigratorService() override;
|
|
|
| void Shutdown() override;
|
| @@ -147,7 +147,7 @@ class PasswordManagerSettingMigratorService
|
| // The initial value for kPasswordManagerSavingEnabled.
|
| bool initial_legacy_pref_value_;
|
|
|
| - syncable_prefs::PrefServiceSyncable* prefs_;
|
| + sync_preferences::PrefServiceSyncable* prefs_;
|
| syncer::SyncService* sync_service_;
|
|
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|