easy-unlock: Tighten finch check.

chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc

Index: chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
diff --git a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc b/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
index 9c3fa4c445bfd5336a001cbce419f44c6a7ec028..10f5f075c70cecfd6c6895aae266beb81cb325aa 100644
--- a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
+++ b/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());