Make text input type and password visibility bit independent in Textfield

ui/views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2011 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/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 481 matching lines @@
   SendKeyEvent(ui::VKEY_RIGHT, false, true, false);
   SendKeyEvent(ui::VKEY_DELETE, true, true, false);
 #if defined(OS_WIN)
   EXPECT_STR_EQ(" two three four", textfield_->text());
 #else
   EXPECT_STR_EQ(" two", textfield_->text());
 #endif
 }
 
 TEST_F(NativeTextfieldViewsTest, PasswordTest) {
-  InitTextfield(Textfield::STYLE_PASSWORD);
+  InitTextfield(Textfield::STYLE_OBSCURED);
 
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
 
   last_contents_.clear();
   textfield_->SetText(ASCIIToUTF16("my password"));
   // Just to make sure the text() and callback returns
   // the actual text instead of "*".
   EXPECT_STR_EQ("my password", textfield_->text());
   EXPECT_TRUE(last_contents_.empty());
 }
 
-TEST_F(NativeTextfieldViewsTest, InputTypeSetsPassword) {
-  InitTextfield(Textfield::STYLE_DEFAULT);
-
-  // Defaults to TEXT
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
-
-  // Setting to passwords also sets password state of textfield.
-  textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
-  EXPECT_TRUE(textfield_->IsPassword());
-}
-
-TEST_F(NativeTextfieldViewsTest, PasswordSetsInputType) {
-  InitTextfield(Textfield::STYLE_DEFAULT);
-
-  // Defaults to TEXT
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
-
-  textfield_->SetPassword(true);
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
-
-  textfield_->SetPassword(false);
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
-}
-
 TEST_F(NativeTextfieldViewsTest, TextInputType) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   // Defaults to TEXT
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
 
   // And can be set.
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_URL, GetTextInputType());
 
@@ skipping 552 matching lines @@
   EXPECT_TRUE(textfield_->key_handled());
   EXPECT_STR_EQ("0123321456789", textfield_->text());
   EXPECT_EQ(8U, textfield_->GetCursorPosition());
   EXPECT_EQ(1, on_before_user_action_);
   EXPECT_EQ(1, on_after_user_action_);
 
   input_method_->Clear();
   textfield_->SetReadOnly(true);
   EXPECT_TRUE(input_method_->text_input_type_changed());
   EXPECT_FALSE(textfield_->GetTextInputClient());
-
-  textfield_->SetReadOnly(false);
-  input_method_->Clear();
-  textfield_->SetPassword(true);
-  EXPECT_TRUE(input_method_->text_input_type_changed());
-  EXPECT_TRUE(textfield_->GetTextInputClient());
 }
 
 TEST_F(NativeTextfieldViewsTest, UndoRedoTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   SendKeyEvent(ui::VKEY_A);
   EXPECT_STR_EQ("a", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
@@ skipping 438 matching lines @@
 #else
   EXPECT_EQ(500U, textfield_->GetCursorPosition());
 #endif
 #endif  // !defined(OS_WIN)
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views