| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 38e8ca7c3e2eb565e250cbeae92d020f0f4ea9e0..3750256162ca0727252b45d976520dca9ac4491f 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -223,8 +223,7 @@ class RenderViewImplTest : public RenderViewTest {
|
| static_cast<ui::KeyboardCode>(key_code),
|
| flags);
|
| ui::KeyEvent event2(xevent);
|
| - event2.set_character(GetCharacterFromKeyCode(event2.key_code(),
|
| - event2.flags()));
|
| + event2.set_character(DomCodeToCharacter(event2.code(), event2.flags()));
|
| ui::KeyEventTestApi test_event2(&event2);
|
| test_event2.set_is_char(true);
|
| NativeWebKeyboardEvent char_event(event2);
|
| @@ -237,8 +236,9 @@ class RenderViewImplTest : public RenderViewTest {
|
| NativeWebKeyboardEvent keyup_event(event3);
|
| SendNativeKeyEvent(keyup_event);
|
|
|
| - long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
|
| - flags);
|
| + ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
|
| + ui::DomCode code = KeyboardCodeToDomCode(keycode);
|
| + long c = DomCodeToCharacter(code, flags);
|
| output->assign(1, static_cast<base::char16>(c));
|
| return 1;
|
| #elif defined(USE_OZONE)
|
| @@ -262,8 +262,9 @@ class RenderViewImplTest : public RenderViewTest {
|
| NativeWebKeyboardEvent keyup_web_event(keyup_event);
|
| SendNativeKeyEvent(keyup_web_event);
|
|
|
| - long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
|
| - flags);
|
| + ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
|
| + ui::DomCode code = KeyboardCodeToDomCode(keycode);
|
| + long c = DomCodeToCharacter(code, flags);
|
| output->assign(1, static_cast<base::char16>(c));
|
| return 1;
|
| #else
|
|
|