Index: ui/views/widget/widget_interactive_uitest.cc |
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc |
index 141220c5fb59ca6d1b53a46dc32c4c8b24d056b1..8d73c42f1d6fffe482f84a503fb5f41e9f4d0b99 100644 |
--- a/ui/views/widget/widget_interactive_uitest.cc |
+++ b/ui/views/widget/widget_interactive_uitest.cc |
@@ -1698,9 +1698,8 @@ TEST_F(WidgetInputMethodInteractiveTest, Activation) { |
Widget* widget = CreateWidget(); |
Textfield* textfield = new Textfield; |
widget->GetRootView()->AddChildView(textfield); |
- textfield->RequestFocus(); |
- |
ShowSync(widget); |
+ textfield->RequestFocus(); |
EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, |
widget->GetInputMethod()->GetTextInputType()); |
@@ -1745,7 +1744,11 @@ TEST_F(WidgetInputMethodInteractiveTest, OneWindow) { |
DeactivateSync(widget); |
textfield1->RequestFocus(); |
+#if defined(OS_MACOSX) |
+ // TODO(warx): WidgetActivationWaiter has a check in ctor. |
+ // Remove ActivateSync(widget) once crbug.com/650859 is fixed. |
ActivateSync(widget); |
+#endif |
EXPECT_TRUE(widget->IsActive()); |
EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, |
widget->GetInputMethod()->GetTextInputType()); |