easy-unlock: Make policy fully override field trial.

chrome/browser/signin/easy_unlock_service_browsertest_chromeos.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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 183 matching lines @@
   // InProcessBrowserTest:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kForceFieldTrials,
                                     "EasyUnlock/Disable/");
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceFinchDisabledTest);
 };
 
-// Tests that easy unlock is off when finch is disabled.
-IN_PROC_BROWSER_TEST_F(EasyUnlockServiceFinchDisabledTest, StayDisabled) {
+// Tests that easy unlock is off when finch is disabled and policy overrides
+// finch.
+IN_PROC_BROWSER_TEST_F(EasyUnlockServiceFinchDisabledTest, PolicyOverride) {
   // Finch is disabled.
   EXPECT_FALSE(service()->IsAllowed());
 #if defined(GOOGLE_CHROME_BUILD)
   EXPECT_FALSE(HasEasyUnlockApp());
 #endif
 
-  // Easy unlock stays off even when it is allowed by policy.
+  // Policy overrides finch and turns on Easy unlock.
   SetEasyUnlockAllowedPolicy(true);
-  EXPECT_FALSE(service()->IsAllowed());
+  EXPECT_TRUE(service()->IsAllowed());
 #if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_FALSE(HasEasyUnlockApp());
+  EXPECT_TRUE(HasEasyUnlockApp());
 #endif
 }
 
 class EasyUnlockServiceMultiProfileTest : public LoginManagerTest {
  public:
   EasyUnlockServiceMultiProfileTest() : LoginManagerTest(false) {}
   virtual ~EasyUnlockServiceMultiProfileTest() {}
 
   // InProcessBrowserTest:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
@@ skipping 31 matching lines @@
   Profile* secondary_profile = ProfileHelper::Get()->GetProfileByUserIdHash(
       secondary_user->username_hash());
 
   EXPECT_TRUE(EasyUnlockService::Get(primary_profile)->IsAllowed());
   EXPECT_FALSE(EasyUnlockService::Get(secondary_profile)->IsAllowed());
 #if defined(GOOGLE_CHROME_BUILD)
   EXPECT_TRUE(HasEasyUnlockAppForProfile(primary_profile));
   EXPECT_FALSE(HasEasyUnlockAppForProfile(secondary_profile));
 #endif
 }