Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index 9f0112aaf16d34181f44ab1d650a588fda539a04..9e959c5d806b657af1c1c7ed200cf434e5d950e9 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -28,6 +28,8 @@ |
#include "ui/base/ime/dummy_text_input_client.h" |
#include "ui/base/ime/input_method.h" |
#include "ui/base/ime/text_input_client.h" |
+#include "ui/base/ime/text_input_focus_manager.h" |
+#include "ui/base/ui_base_switches_util.h" |
#include "ui/events/test/test_event_handler.h" |
#include "ui/keyboard/keyboard_controller_proxy.h" |
#include "ui/keyboard/keyboard_switches.h" |
@@ -805,7 +807,12 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, EnsureCaretInWorkArea) { |
MockTextInputClient text_input_client; |
ui::InputMethod* input_method = proxy->GetInputMethod(); |
ASSERT_TRUE(input_method); |
- input_method->SetFocusedTextInputClient(&text_input_client); |
+ if (switches::IsTextInputFocusManagerEnabled()) { |
+ ui::TextInputFocusManager::GetInstance()->FocusTextInputClient( |
+ &text_input_client); |
+ } else { |
+ input_method->SetFocusedTextInputClient(&text_input_client); |
+ } |
aura::Window* root_window = Shell::GetPrimaryRootWindow(); |
aura::Window* keyboard_container = |
@@ -825,6 +832,13 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, EnsureCaretInWorkArea) { |
text_input_client.visible_rect().width()); |
ASSERT_EQ(keyboard_container->bounds().height() - keyboard_height, |
text_input_client.visible_rect().height()); |
+ |
+ if (switches::IsTextInputFocusManagerEnabled()) { |
+ ui::TextInputFocusManager::GetInstance()->BlurTextInputClient( |
+ &text_input_client); |
+ } else { |
+ input_method->SetFocusedTextInputClient(NULL); |
+ } |
} |
} // namespace test |