| Index: chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc
|
| index 4d7bde7962617da74e37fbd452208742e920c60e..a286aabe8e3d5bd3384fadf21489f0ea6f724e7f 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc
|
| @@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,
|
| ASSERT_TRUE(activated_listener.was_satisfied());
|
|
|
| // onFocus event should be fired if FocusIn function is called.
|
| - ExtensionTestMessageListener focus_listener("onFocus", false);;
|
| + ExtensionTestMessageListener focus_listener("onFocus:text", false);;
|
| engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_TEXT);
|
| ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| ASSERT_TRUE(focus_listener.was_satisfied());
|
| @@ -794,6 +794,56 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,
|
| EXPECT_EQ(3U,
|
| mock_input_context->last_delete_surrounding_text_arg().length);
|
| }
|
| + {
|
| + SCOPED_TRACE("onFocus test");
|
| + mock_input_context->Reset();
|
| + mock_candidate_window->Reset();
|
| + mock_property->Reset();
|
| +
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:text", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_TEXT);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:search", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_SEARCH);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:tel", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_TELEPHONE);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:url", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_URL);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:email", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_EMAIL);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:password", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_PASSWORD);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + {
|
| + ExtensionTestMessageListener focus_listener("onFocus:number", false);
|
| + engine_handler->FocusIn(ibus::TEXT_INPUT_TYPE_NUMBER);
|
| + ASSERT_TRUE(focus_listener.WaitUntilSatisfied());
|
| + ASSERT_TRUE(focus_listener.was_satisfied());
|
| + }
|
| + }
|
| +
|
| IBusBridge::Get()->SetInputContextHandler(NULL);
|
| IBusBridge::Get()->SetCandidateWindowHandler(NULL);
|
| IBusBridge::Get()->SetPropertyHandler(NULL);
|
|
|