Index: ui/keyboard/keyboard_controller_unittest.cc |
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc |
index 9b8f8b7822f83982d9ee7f7f7876909be533e540..955e92dbf2aa8a55ca89db6d97835c456cbd4c03 100644 |
--- a/ui/keyboard/keyboard_controller_unittest.cc |
+++ b/ui/keyboard/keyboard_controller_unittest.cc |
@@ -10,6 +10,7 @@ |
#include "base/command_line.h" |
#include "base/macros.h" |
#include "base/message_loop/message_loop.h" |
+#include "base/run_loop.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/aura/client/focus_client.h" |
#include "ui/aura/layout_manager.h" |
@@ -379,7 +380,7 @@ TEST_F(KeyboardControllerTest, VisibilityChangeWithTextInputTypeChange) { |
EXPECT_TRUE(keyboard_container->IsVisible()); |
EXPECT_TRUE(WillHideKeyboard()); |
// Wait for hide keyboard to finish. |
- base::MessageLoop::current()->Run(); |
+ base::RunLoop().Run(); |
EXPECT_FALSE(keyboard_container->IsVisible()); |
SetFocus(&input_client_1); |
@@ -447,7 +448,7 @@ TEST_F(KeyboardControllerTest, FloatingKeyboardDontOverscrollOrResize) { |
EXPECT_EQ(gfx::Rect(), notified_bounds()); |
EXPECT_EQ(2, number_of_calls()); |
SetFocus(&no_input_client); |
- base::MessageLoop::current()->Run(); |
+ base::RunLoop().Run(); |
EXPECT_EQ(gfx::Rect(), notified_bounds()); |
EXPECT_EQ(3, number_of_calls()); |
SetFocus(&input_client); |
@@ -515,7 +516,7 @@ TEST_F(KeyboardControllerTest, AlwaysVisibleWhenLocked) { |
EXPECT_TRUE(WillHideKeyboard()); |
// Wait for hide keyboard to finish. |
- base::MessageLoop::current()->Run(); |
+ base::RunLoop().Run(); |
EXPECT_FALSE(keyboard_container->IsVisible()); |
keyboard::SetAccessibilityKeyboardEnabled(false); |
} |