easy-unlock: Tighten finch check.

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 118 matching lines @@
 
  private:
   policy::MockConfigurationPolicyProvider provider_;
   scoped_refptr<testing::NiceMock<MockBluetoothAdapter> > mock_adapter_;
   bool is_bluetooth_adapter_present_;
   FakePowerManagerClient* power_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceTest);
 };
 
-// Tests that EasyUnlock is on by default.
-IN_PROC_BROWSER_TEST_F(EasyUnlockServiceTest, DefaultOn) {
-  EXPECT_TRUE(service()->IsAllowed());
+IN_PROC_BROWSER_TEST_F(EasyUnlockServiceTest, NoFinchNoService) {
+  EXPECT_FALSE(service()->IsAllowed());
 #if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_TRUE(HasEasyUnlockApp());
+  EXPECT_FALSE(HasEasyUnlockApp());
 #endif
 }
 
-#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:
   EasyUnlockServiceNoBluetoothTest() {}
   virtual ~EasyUnlockServiceNoBluetoothTest() {}
 
   // InProcessBrowserTest:
   virtual void SetUpInProcessBrowserTestFixture() override {
     set_is_bluetooth_adapter_present(false);
     EasyUnlockServiceTest::SetUpInProcessBrowserTestFixture();
   }
@@ skipping 17 matching lines @@
   // InProcessBrowserTest:
   virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kForceFieldTrials,
                                     "EasyUnlock/Enable/");
   }
 
  private:
   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());
 #if defined(GOOGLE_CHROME_BUILD)
   EXPECT_TRUE(HasEasyUnlockApp());
 #endif
 
   // Overridden by policy.
   SetEasyUnlockAllowedPolicy(false);
   EXPECT_FALSE(service()->IsAllowed());
@@ skipping 82 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
 }