easy-unlock: Make policy fully override field trial.

chrome/browser/signin/easy_unlock_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/easy_unlock_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 178 matching lines @@
 #if defined(OS_CHROMEOS)
   if (!user_manager::UserManager::Get()->IsLoggedInAsRegularUser())
     return false;
 
   if (!chromeos::ProfileHelper::IsPrimaryProfile(profile_))
     return false;
 
   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;
 
   return true;
 #else
   // TODO(xiyuan): Revisit when non-chromeos platforms are supported.
   return false;
 #endif
 }
@@ skipping 222 matching lines @@
   // Make sure lock screen state set by the extension gets reset.
   screenlock_state_handler_.reset();
 
   if (GetComponentLoader(profile_)->Exists(extension_misc::kEasyUnlockAppId)) {
     extensions::ExtensionSystem* extension_system =
         extensions::ExtensionSystem::Get(profile_);
     extension_system->extension_service()->ReloadExtension(
         extension_misc::kEasyUnlockAppId);
   }
 }