| 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 b86a311f0cd9d35ad9c4f2e0abbf89c377a19479..b7812f64181ca0004bd2ec12ba27c920a19b7545 100644
|
| --- a/chrome/browser/signin/easy_unlock_service.cc
|
| +++ b/chrome/browser/signin/easy_unlock_service.cc
|
| @@ -196,9 +196,12 @@ bool EasyUnlockService::IsAllowed() {
|
| if (!profile_->GetPrefs()->GetBoolean(prefs::kEasyUnlockAllowed))
|
| return false;
|
|
|
| - // It is disabled when the trial exists and is in "Disable" group.
|
| - if (base::FieldTrialList::FindFullName("EasyUnlock") == "Disable")
|
| - return false;
|
| + // Respect existing policy and skip finch test.
|
| + if (!profile_->GetPrefs()->IsManagedPreference(prefs::kEasyUnlockAllowed)) {
|
| + // It is disabled when the trial exists and is in "Disable" group.
|
| + if (base::FieldTrialList::FindFullName("EasyUnlock") == "Disable")
|
| + return false;
|
| + }
|
|
|
| if (!bluetooth_detector_->IsPresent())
|
| return false;
|
|
|