| Index: chrome/browser/chromeos/arc/arc_auth_service.h
|
| diff --git a/chrome/browser/chromeos/arc/arc_auth_service.h b/chrome/browser/chromeos/arc/arc_auth_service.h
|
| index 55831acddf927a5752ab52d25ae9b32c25b7ee36..e2a7748599b699cd207a3f9582b49d82c62d57ca 100644
|
| --- a/chrome/browser/chromeos/arc/arc_auth_service.h
|
| +++ b/chrome/browser/chromeos/arc/arc_auth_service.h
|
| @@ -21,8 +21,8 @@
|
| #include "components/arc/common/auth.mojom.h"
|
| #include "components/arc/instance_holder.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| -#include "components/syncable_prefs/pref_service_syncable_observer.h"
|
| -#include "components/syncable_prefs/synced_pref_observer.h"
|
| +#include "components/sync_preferences/pref_service_syncable_observer.h"
|
| +#include "components/sync_preferences/synced_pref_observer.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
|
|
| class ArcAppLauncher;
|
| @@ -53,8 +53,8 @@ class ArcAuthService : public ArcService,
|
| public InstanceHolder<mojom::AuthInstance>::Observer,
|
| public ArcAuthContextDelegate,
|
| public ArcAuthCodeFetcherDelegate,
|
| - public syncable_prefs::PrefServiceSyncableObserver,
|
| - public syncable_prefs::SyncedPrefObserver {
|
| + public sync_preferences::PrefServiceSyncableObserver,
|
| + public sync_preferences::SyncedPrefObserver {
|
| public:
|
| enum class State {
|
| NOT_INITIALIZED, // Service is not initialized.
|
| @@ -166,10 +166,10 @@ class ArcAuthService : public ArcService,
|
| void EnableArc();
|
| void DisableArc();
|
|
|
| - // syncable_prefs::PrefServiceSyncableObserver
|
| + // sync_preferences::PrefServiceSyncableObserver
|
| void OnIsSyncingChanged() override;
|
|
|
| - // syncable_prefs::SyncedPrefObserver
|
| + // sync_preferences::SyncedPrefObserver
|
| void OnSyncedPrefChanged(const std::string& path, bool from_sync) override;
|
|
|
| // ArcAuthContextDelegate:
|
|
|