Revert "Change hiding timer logic for password textfield on login/lock screen"

This reverts commit 4af05312.

Reason for revert: Breaking ash_unittests and browser_tests
on chrome os builders, see
https://bugs.chromium.org/p/chromium/issues/detail?id=1112924

Original change's description:
> Change hiding timer logic for password textfield on login/lock screen
> 
> 5-second instead of 3-second timer for password/PIN going back to masked format.
> 5-second timer will reset upon character being entered to keep the password/PIN visible during revision.
> 
> Bug: 1101326
> Change-Id: I962139aef26bd9fb68e5110d5169d0f486a5bce4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314176
> Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> Commit-Queue: Thomas Tellier <tellier@google.com>
> Cr-Commit-Position: refs/heads/master@{#794602}

TBR=rsorokin@chromium.org,tellier@google.com

Change-Id: I2cb94561e291ccadf623af2bd4529cd4c9bd23de
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1101326
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2337388Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794721}

ash/login/ui/login_password_view.cc

@@ -108,7 +108,7 @@ constexpr base::TimeDelta kClearPasswordAfterDelay =
 
 // Hides the password after a short delay for security reasons.
 constexpr base::TimeDelta kHidePasswordAfterDelay =
-    base::TimeDelta::FromSeconds(5);
+    base::TimeDelta::FromSeconds(3);
 
 constexpr const char kLoginPasswordViewName[] = "LoginPasswordView";
 
@@ -742,10 +742,11 @@ void LoginPasswordView::ContentsChanged(views::Textfield* sender,
   if (!is_display_password_feature_enabled_)
     return;
 
-  // If the password is currently revealed.
-  if (textfield_->GetTextInputType() == ui::TEXT_INPUT_TYPE_NULL)
-    hide_password_timer_->Reset();
-  clear_password_timer_->Reset();
+  // Only reset the timer if the display password feature is enabled.
+  if (display_password_button_->GetVisible())
+    clear_password_timer_->Reset();
+  // For UX purposes, hide back the password when the user is typing.
+  HidePassword(false /*chromevox_exception*/);
   display_password_button_->SetEnabled(!new_contents.empty());
 }
 

ash/login/ui/login_password_view_test.cc

@@ -326,15 +326,12 @@ TEST_F(LoginPasswordViewTestFeatureEnabled, PasswordAutoClearsAndHides) {
             ui::TEXT_INPUT_TYPE_PASSWORD);
 }
 
-// Verifies that the password textfield remains in the same visibility state
-// when the content changes.
-TEST_F(LoginPasswordViewTestFeatureEnabled,
-       ContentChangesDoNotImpactPasswordVisibility) {
+// Verifies that the password textfield hides back when the content changes.
+TEST_F(LoginPasswordViewTestFeatureEnabled, PasswordHidesAfterTyping) {
   LoginPasswordView::TestApi test_api(view_);
   ui::test::EventGenerator* generator = GetEventGenerator();
 
-  // Type to enable the display password button and click on it to display the
-  // password.
+  // Show the password.
   EXPECT_EQ(test_api.textfield()->GetTextInputType(),
             ui::TEXT_INPUT_TYPE_PASSWORD);
   generator->PressKey(ui::KeyboardCode::VKEY_A, ui::EF_NONE);
@@ -343,22 +340,18 @@ TEST_F(LoginPasswordViewTestFeatureEnabled,
   generator->ClickLeftButton();
   EXPECT_EQ(test_api.textfield()->GetTextInputType(), ui::TEXT_INPUT_TYPE_NULL);
 
-  // Type manually and programmatically, and check if the password textfield
-  // remains visible.
+  // Type and check if the password textfield hides back.
   generator->PressKey(ui::KeyboardCode::VKEY_A, ui::EF_NONE);
-  EXPECT_EQ(test_api.textfield()->GetTextInputType(), ui::TEXT_INPUT_TYPE_NULL);
-  test_api.textfield()->InsertText(base::ASCIIToUTF16("test"));
-  EXPECT_EQ(test_api.textfield()->GetTextInputType(), ui::TEXT_INPUT_TYPE_NULL);
+  EXPECT_EQ(test_api.textfield()->GetTextInputType(),
+            ui::TEXT_INPUT_TYPE_PASSWORD);
 
-  // Click again on the display password button to hide the password.
+  // Click again to show the password.
   generator->MoveMouseTo(
       test_api.display_password_button()->GetBoundsInScreen().CenterPoint());
   generator->ClickLeftButton();
-  EXPECT_EQ(test_api.textfield()->GetTextInputType(),
-            ui::TEXT_INPUT_TYPE_PASSWORD);
+  EXPECT_EQ(test_api.textfield()->GetTextInputType(), ui::TEXT_INPUT_TYPE_NULL);
 
-  // Type manually and programmatically, and check if the password textfield
-  // remains invisible.
+  // Modifies the content programmatically and check it is still triggered.
   test_api.textfield()->InsertText(base::ASCIIToUTF16("test"));
   EXPECT_EQ(test_api.textfield()->GetTextInputType(),
             ui::TEXT_INPUT_TYPE_PASSWORD);