| Index: chrome/browser/signin/signin_manager_factory.cc
|
| diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
|
| index ee1af53f714d0af566a3ebca6892e4bf2b94990e..bcefd78c3600f1d692aa72a368f71b08707e8714 100644
|
| --- a/chrome/browser/signin/signin_manager_factory.cc
|
| +++ b/chrome/browser/signin/signin_manager_factory.cc
|
| @@ -34,25 +34,25 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
|
| return Singleton<SigninManagerFactory>::get();
|
| }
|
|
|
| -void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) {
|
| +void SigninManagerFactory::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
|
| user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "",
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "",
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
|
| - new ListValue, PrefService::UNSYNCABLE_PREF);
|
| + new ListValue,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| // static
|
| -void SigninManagerFactory::RegisterPrefs(PrefService* local_state) {
|
| - local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "",
|
| - PrefService::UNSYNCABLE_PREF);
|
| +void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) {
|
| + local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");
|
| }
|
|
|
| ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
|
|
|