Index: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
index 745551f621b99d687dfaddc1b0f3853885373481..9135feb93e3629fbdbb0b96b73c65e237bcb773e 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
@@ -36,6 +36,7 @@ |
#include "ui/chromeos/ime/input_method_menu_item.h" |
#include "ui/chromeos/ime/input_method_menu_manager.h" |
#include "ui/events/keycodes/keyboard_codes.h" |
+#include "ui/keyboard/content/keyboard_content_util.h" |
namespace chromeos { |
@@ -1409,5 +1410,32 @@ TEST_F(InputMethodManagerImplTest, MigrateInputMethodTest) { |
EXPECT_EQ(ImeIdFromEngineId("zh-t-i0-pinyin"), input_method_ids[3]); |
} |
+TEST_F(InputMethodManagerImplTest, OverrideKeyboardRefWithEmoji) { |
+ GURL inputview_url( |
+ "chrome-extension://" |
+ "inputview.html#id=us.compact.qwerty&language=en-US&passwordLayout=us." |
+ "compact.qwerty&name=keyboard_us"); |
+ keyboard::SetOverrideContentUrl(inputview_url); |
+ |
+ EXPECT_EQ(inputview_url, keyboard::GetOverrideContentUrl()); |
+ |
+ manager_->OverrideKeyboardRef("emoji"); |
+ GURL overridden_url( |
+ "chrome-extension://" |
+ "inputview.html#id=emoji&language=en-US&passwordLayout=us." |
+ "compact.qwerty&name=keyboard_us"); |
+ EXPECT_EQ(overridden_url, keyboard::GetOverrideContentUrl()); |
+} |
+ |
+TEST_F(InputMethodManagerImplTest, OverrideDefaultKeyboardRef) { |
+ GURL default_url_("chrome://inputview.html"); |
James Cook
2016/09/14 21:14:28
nit: no trailing _ for local variable
Azure Wei
2016/09/15 03:44:51
Done.
|
+ keyboard::SetOverrideContentUrl(default_url_); |
+ |
+ EXPECT_EQ(default_url_, keyboard::GetOverrideContentUrl()); |
James Cook
2016/09/14 21:14:28
optional: it's OK to copy/paste strings in tests i
|
+ |
+ manager_->OverrideKeyboardRef("emoji"); |
+ EXPECT_EQ(default_url_, keyboard::GetOverrideContentUrl()); |
+} |
+ |
} // namespace input_method |
} // namespace chromeos |