Don't use opaque icons for easy unlock

chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.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 <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 313 matching lines @@
   EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());
   EXPECT_TRUE(lock_handler_->IsCustomIconAnimated());
   EXPECT_EQ(100, lock_handler_->GetCustomIconOpacity());
 
   state_handler_->ChangeState(
       EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING);
   // Duplicated state change should be ignored.
   EXPECT_EQ(0u, lock_handler_->GetAndResetShowIconCount());
 }
 
-TEST_F(EasyUnlockScreenlockStateHandlerTest, PhoneLocked) {
-  pref_service_->SetBoolean(prefs::kEasyUnlockShowTutorial, false);
-  state_handler_->ChangeState(
-      EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED);
-
-  EXPECT_EQ(1u, lock_handler_->GetAndResetShowIconCount());
-  EXPECT_EQ(ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
-            lock_handler_->GetAuthType(user_email_));
-
-  ASSERT_TRUE(lock_handler_->HasCustomIcon());
-  EXPECT_EQ(kLockedIconURL, lock_handler_->GetCustomIconURL());
-  EXPECT_TRUE(lock_handler_->CustomIconHasTooltip());
-  EXPECT_FALSE(lock_handler_->IsCustomIconTooltipAutoshown());
-  EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());
-  EXPECT_FALSE(lock_handler_->IsCustomIconAnimated());
-  EXPECT_EQ(100, lock_handler_->GetCustomIconOpacity());
-
-  state_handler_->ChangeState(
-      EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED);
-  // Duplicated state change should be ignored.
-  EXPECT_EQ(0u, lock_handler_->GetAndResetShowIconCount());
-}
-
-TEST_F(EasyUnlockScreenlockStateHandlerTest, PhoneNotAuthenticated) {
-  pref_service_->SetBoolean(prefs::kEasyUnlockShowTutorial, false);
-  state_handler_->ChangeState(
-      EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED);
-
-  EXPECT_EQ(1u, lock_handler_->GetAndResetShowIconCount());
-  EXPECT_EQ(ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
-            lock_handler_->GetAuthType(user_email_));
-
-  ASSERT_TRUE(lock_handler_->HasCustomIcon());
-  EXPECT_EQ(kLockedIconURL, lock_handler_->GetCustomIconURL());
-  EXPECT_TRUE(lock_handler_->CustomIconHasTooltip());
-  EXPECT_FALSE(lock_handler_->IsCustomIconTooltipAutoshown());
-  EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());
-  EXPECT_FALSE(lock_handler_->IsCustomIconAnimated());
-  EXPECT_EQ(100, lock_handler_->GetCustomIconOpacity());
-
-  state_handler_->ChangeState(
-      EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED);
-  // Duplicated state change should be ignored.
-  EXPECT_EQ(0u, lock_handler_->GetAndResetShowIconCount());
-}
-
-TEST_F(EasyUnlockScreenlockStateHandlerTest, StatesWithOpaqueIcons) {
+TEST_F(EasyUnlockScreenlockStateHandlerTest, StatesWithLockedIcon) {
   pref_service_->SetBoolean(prefs::kEasyUnlockShowTutorial, false);
 
   std::vector<EasyUnlockScreenlockStateHandler::State> states;
   states.push_back(EasyUnlockScreenlockStateHandler::STATE_NO_BLUETOOTH);
   states.push_back(EasyUnlockScreenlockStateHandler::STATE_NO_PHONE);
   states.push_back(EasyUnlockScreenlockStateHandler::STATE_PHONE_UNSUPPORTED);
   states.push_back(EasyUnlockScreenlockStateHandler::STATE_PHONE_UNLOCKABLE);
+  states.push_back(
+      EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED);
+  states.push_back(EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED);
 
   for (size_t i = 0; i < states.size(); ++i) {
     state_handler_->ChangeState(states[i]);
 
     EXPECT_EQ(1u, lock_handler_->GetAndResetShowIconCount())
         << "State: " << states[i];
     EXPECT_EQ(ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
               lock_handler_->GetAuthType(user_email_))
         << "State: " << states[i];
 
     ASSERT_TRUE(lock_handler_->HasCustomIcon())
         << "State: " << states[i];
     EXPECT_EQ(kLockedIconURL, lock_handler_->GetCustomIconURL())
         << "State: " << states[i];
     EXPECT_TRUE(lock_handler_->CustomIconHasTooltip())
         << "State: " << states[i];
     EXPECT_FALSE(lock_handler_->IsCustomIconTooltipAutoshown())
         << "State: " << states[i];
     EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick())
         << "State: " << states[i];
     EXPECT_FALSE(lock_handler_->IsCustomIconAnimated())
         << "State: " << states[i];
-    EXPECT_EQ(50, lock_handler_->GetCustomIconOpacity())
+    EXPECT_EQ(100, lock_handler_->GetCustomIconOpacity())
         << "State: " << states[i];
 
     state_handler_->ChangeState(states[i]);
     EXPECT_EQ(0u, lock_handler_->GetAndResetShowIconCount())
         << "State: " << states[i];
   }
 }
 
 TEST_F(EasyUnlockScreenlockStateHandlerTest,
        LockScreenClearedOnStateHandlerDestruction) {
@@ skipping 193 matching lines @@
   state_handler_->ChangeState(
       EasyUnlockScreenlockStateHandler::STATE_AUTHENTICATED);
   EXPECT_EQ(1u, lock_handler_->GetAndResetShowIconCount());
   EXPECT_TRUE(lock_handler_->HasCustomIcon());
   EXPECT_EQ(ScreenlockBridge::LockHandler::USER_CLICK,
             lock_handler_->GetAuthType(user_email_));
   EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());
 }
 
 }  // namespace