easy-unlock: Tighten finch check.

Tighten finch check a bit so that the missing trial is treated as disable.

BUG=423016

Review URL: https://codereview.chromium.org/649223003

Cr-Commit-Position: refs/heads/master@{#299408}

chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc

@@ -136,23 +136,12 @@ class EasyUnlockServiceTest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceTest);
 };
 
-// Tests that EasyUnlock is on by default.
-IN_PROC_BROWSER_TEST_F(EasyUnlockServiceTest, DefaultOn) {
-  EXPECT_TRUE(service()->IsAllowed());
-#if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_TRUE(HasEasyUnlockApp());
-#endif
-}
-
+IN_PROC_BROWSER_TEST_F(EasyUnlockServiceTest, NoFinchNoService) {
+  EXPECT_FALSE(service()->IsAllowed());
 #if defined(GOOGLE_CHROME_BUILD)
-IN_PROC_BROWSER_TEST_F(EasyUnlockServiceTest, UnloadsOnSuspend) {
-  EXPECT_TRUE(HasEasyUnlockApp());
-  power_manager_client()->SendSuspendImminent();
   EXPECT_FALSE(HasEasyUnlockApp());
-  power_manager_client()->SendSuspendDone();
-  EXPECT_TRUE(HasEasyUnlockApp());
-}
 #endif
+}
 
 class EasyUnlockServiceNoBluetoothTest : public EasyUnlockServiceTest {
  public:
@@ -191,6 +180,23 @@ class EasyUnlockServiceFinchEnabledTest : public EasyUnlockServiceTest {
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceFinchEnabledTest);
 };
 
+IN_PROC_BROWSER_TEST_F(EasyUnlockServiceFinchEnabledTest, Enabled) {
+  EXPECT_TRUE(service()->IsAllowed());
+#if defined(GOOGLE_CHROME_BUILD)
+  EXPECT_TRUE(HasEasyUnlockApp());
+#endif
+}
+
+#if defined(GOOGLE_CHROME_BUILD)
+IN_PROC_BROWSER_TEST_F(EasyUnlockServiceFinchEnabledTest, UnloadsOnSuspend) {
+  EXPECT_TRUE(HasEasyUnlockApp());
+  power_manager_client()->SendSuspendImminent();
+  EXPECT_FALSE(HasEasyUnlockApp());
+  power_manager_client()->SendSuspendDone();
+  EXPECT_TRUE(HasEasyUnlockApp());
+}
+#endif
+
 // Tests that policy can override finch to turn easy unlock off.
 IN_PROC_BROWSER_TEST_F(EasyUnlockServiceFinchEnabledTest, PolicyOveride) {
   EXPECT_TRUE(service()->IsAllowed());

chrome/browser/signin/easy_unlock_service_regular.cc

@@ -191,9 +191,8 @@ bool EasyUnlockServiceRegular::IsAllowedInternal() {
 
   // 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;
+    // It is enabled when the trial exists and is in "Enable" group.
+    return base::FieldTrialList::FindFullName("EasyUnlock") == "Enable";
   }
 
   return true;