Index: chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc |
diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc |
index 3256836bee59c9129bfafd1131879fe52dbff85a..562c0d8b7d53ed3428387a52c81f8026fe66f8c8 100644 |
--- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc |
+++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc |
@@ -8,15 +8,19 @@ |
#include "base/command_line.h" |
#include "base/memory/ref_counted.h" |
+#include "base/prefs/pref_service.h" |
#include "base/strings/stringprintf.h" |
#include "chrome/browser/chromeos/extensions/input_method_event_router.h" |
#include "chrome/browser/chromeos/input_method/input_method_util.h" |
+#include "chrome/common/pref_names.h" |
+#include "chromeos/chromeos_switches.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/notification_service.h" |
#include "extensions/common/switches.h" |
#include "extensions/browser/api/test/test_api.h" |
#include "extensions/browser/notification_types.h" |
+#include "extensions/test/extension_test_message_listener.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/base/ime/chromeos/extension_ime_util.h" |
#include "ui/base/ime/chromeos/input_method_manager.h" |
@@ -69,6 +73,7 @@ class ExtensionInputMethodApiTest : public ExtensionApiTest { |
command_line->AppendSwitchASCII( |
extensions::switches::kWhitelistedExtensionID, |
"ilanclmaeigfpnmdlgelmhkpkegdioip"); |
+ command_line->AppendSwitch(chromeos::switches::kEnableImeMenu); |
} |
}; |
@@ -77,6 +82,15 @@ class ExtensionInputMethodApiTest : public ExtensionApiTest { |
IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) { |
// Listener for extension's background ready. |
TestListener listener; |
+ // Listerner for IME menu event ready. |
stevenjb
2016/01/21 19:16:16
Listener
Azure Wei
2016/01/23 02:40:39
Done.
|
+ ExtensionTestMessageListener ime_menu_listener("ime_menu_ready", false); |
+ browser()->profile()->GetPrefs()->SetBoolean(prefs::kLangugaeImeMenuActivated, |
Devlin
2016/01/21 19:30:25
kLangugae? Is that typo everywhere?
Azure Wei
2016/01/23 02:40:39
Oh, I've so embarrassed. Corrected them in this cl
|
+ true); |
ASSERT_TRUE(RunExtensionTest("input_method")) << message_; |
+ |
+ // Trigger chrome.inputMethodPrivate.onImeMenuActivationChanged() event. |
+ browser()->profile()->GetPrefs()->SetBoolean(prefs::kLangugaeImeMenuActivated, |
+ false); |
+ ASSERT_TRUE(ime_menu_listener.WaitUntilSatisfied()) << message_; |
} |