| Index: chrome/browser/signin/easy_unlock_service.cc
|
| diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
|
| index 9af5d0c71df8199296c41b10d97df57c503e23e6..3d5a3d5602852ba83cb19e8f4cb1b865cc78688f 100644
|
| --- a/chrome/browser/signin/easy_unlock_service.cc
|
| +++ b/chrome/browser/signin/easy_unlock_service.cc
|
| @@ -261,18 +261,10 @@ EasyUnlockService::~EasyUnlockService() {
|
| // static
|
| void EasyUnlockService::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| - registry->RegisterBooleanPref(
|
| - prefs::kEasyUnlockAllowed,
|
| - true,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(
|
| - prefs::kEasyUnlockEnabled,
|
| - false,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterDictionaryPref(
|
| - prefs::kEasyUnlockPairing,
|
| - new base::DictionaryValue(),
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(prefs::kEasyUnlockAllowed, true);
|
| + registry->RegisterBooleanPref(prefs::kEasyUnlockEnabled, false);
|
| + registry->RegisterDictionaryPref(prefs::kEasyUnlockPairing,
|
| + new base::DictionaryValue());
|
| registry->RegisterBooleanPref(
|
| prefs::kEasyUnlockProximityRequired,
|
| false,
|
|
|