Index: ui/views/controls/textfield/native_textfield_views_unittest.cc |
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc |
index 21213d213cf5a7633fb8ec37c93d49fe15783575..7edbec5dc88686652db5214043a330209b9269c9 100644 |
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc |
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc |
@@ -499,7 +499,7 @@ TEST_F(NativeTextfieldViewsTest, InsertionDeletionTest) { |
} |
TEST_F(NativeTextfieldViewsTest, PasswordTest) { |
- InitTextfield(Textfield::STYLE_PASSWORD); |
+ InitTextfield(Textfield::STYLE_OBSCURED); |
EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType()); |
@@ -511,31 +511,6 @@ TEST_F(NativeTextfieldViewsTest, PasswordTest) { |
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); |
@@ -1108,12 +1083,6 @@ TEST_F(NativeTextfieldViewsTest, TextInputClientTest) { |
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) { |