| Index: ui/views/controls/textfield/textfield_unittest.cc
|
| diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
|
| index b40de20b5fcd77bc9c8f7729fefcd4de45fcdb0c..4de82b0a20be2f97ede82427d5dcb64d62d9a632 100644
|
| --- a/ui/views/controls/textfield/textfield_unittest.cc
|
| +++ b/ui/views/controls/textfield/textfield_unittest.cc
|
| @@ -1128,7 +1128,13 @@ TEST_F(TextfieldTest, CursorMovement) {
|
| EXPECT_STR_EQ("one two", last_contents_);
|
| }
|
|
|
| -TEST_F(TextfieldTest, FocusTraversalTest) {
|
| +// Disabled on Mac (synthesized event bug). http://crbug.com/623420.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_FocusTraversalTest DISABLED_FocusTraversalTest
|
| +#else
|
| +#define MAYBE_FocusTraversalTest FocusTraversalTest
|
| +#endif
|
| +TEST_F(TextfieldTest, MAYBE_FocusTraversalTest) {
|
| InitTextfields(3);
|
| textfield_->RequestFocus();
|
|
|
| @@ -1586,7 +1592,13 @@ TEST_F(TextfieldTest, ReadOnlyTest) {
|
| EXPECT_STR_EQ(" four five six ", textfield_->GetSelectedText());
|
| }
|
|
|
| -TEST_F(TextfieldTest, TextInputClientTest) {
|
| +// Disabled on Mac (synthesized event bug). http://crbug.com/623420.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_TextInputClientTest DISABLED_TextInputClientTest
|
| +#else
|
| +#define MAYBE_TextInputClientTest TextInputClientTest
|
| +#endif
|
| +TEST_F(TextfieldTest, MAYBE_TextInputClientTest) {
|
| InitTextfield();
|
| ui::TextInputClient* client = textfield_;
|
| EXPECT_TRUE(client);
|
| @@ -2490,7 +2502,15 @@ TEST_F(TextfieldTest, GetTextfieldBaseline_FontFallbackTest) {
|
|
|
| // Tests that a textfield view can be destroyed from OnKeyEvent() on its
|
| // controller and it does not crash.
|
| -TEST_F(TextfieldTest, DestroyingTextfieldFromOnKeyEvent) {
|
| +// Disabled on Mac (synthesized event bug). http://crbug.com/623420.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_DestroyingTextfieldFromOnKeyEvent \
|
| + DISABLED_DestroyingTextfieldFromOnKeyEvent
|
| +#else
|
| +#define MAYBE_DestroyingTextfieldFromOnKeyEvent \
|
| + DestroyingTextfieldFromOnKeyEvent
|
| +#endif
|
| +TEST_F(TextfieldTest, MAYBE_DestroyingTextfieldFromOnKeyEvent) {
|
| InitTextfield();
|
|
|
| // The controller assumes ownership of the textfield.
|
|
|