Deflake WidgetInputMethodInteractiveTest.TwoTopWindows on Linux

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 2013 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 1564 matching lines @@
   ActivateSync(parent);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD,
             parent->GetInputMethod()->GetTextInputType());
 #endif
 
   parent->CloseNow();
 }
 
 // Test input method focus changes affected by focus changes cross 2 top
 // windows.
-// Flaky: https://crbug.com/484836
-TEST_F(WidgetInputMethodInteractiveTest, DISABLED_TwoTopWindows) {
+TEST_F(WidgetInputMethodInteractiveTest, TwoTopWindows) {
   Widget* widget1 = CreateWidget();
   Widget* widget2 = CreateWidget();
   Textfield* textfield1 = new Textfield;
   Textfield* textfield2 = new Textfield;
   textfield2->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   widget1->GetRootView()->AddChildView(textfield1);
   widget2->GetRootView()->AddChildView(textfield2);
-  widget1->Show();
-  widget2->Show();
+
+  // Do the initial shows synchronously. Otherwise, on X11, the window server
+  // messages may be interleaved with the activation requests below.
+  ShowSync(widget1);
+  ShowSync(widget2);
 
   textfield1->RequestFocus();
   textfield2->RequestFocus();
 
   ActivateSync(widget1);
 
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
             widget1->GetInputMethod()->GetTextInputType());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget2->GetInputMethod()->GetTextInputType());
@@ skipping 31 matching lines @@
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->SetReadOnly(true);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views