| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 713f435ad5e1f217c2b4de6a8834ee1751bd767c..7e75e8dc831f4a7254e47fea6a5c670f3926917f 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -229,8 +229,8 @@ 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(
|
| + DomCodeToUsLayoutCharacter(event2.code(), event2.flags()));
|
| ui::KeyEventTestApi test_event2(&event2);
|
| test_event2.set_is_char(true);
|
| NativeWebKeyboardEvent char_event(event2);
|
| @@ -243,8 +243,9 @@ class RenderViewImplTest : public RenderViewTest {
|
| NativeWebKeyboardEvent keyup_event(event3);
|
| SendNativeKeyEvent(keyup_event);
|
|
|
| - long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
|
| - flags);
|
| + long c = DomCodeToUsLayoutCharacter(
|
| + UsLayoutKeyboardCodeToDomCode(static_cast<ui::KeyboardCode>(key_code)),
|
| + flags);
|
| output->assign(1, static_cast<base::char16>(c));
|
| return 1;
|
| #elif defined(USE_OZONE)
|
| @@ -268,8 +269,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);
|
| + long c = DomCodeToUsLayoutCharacter(
|
| + UsLayoutKeyboardCodeToDomCode(static_cast<ui::KeyboardCode>(key_code)),
|
| + flags);
|
| output->assign(1, static_cast<base::char16>(c));
|
| return 1;
|
| #else
|
|
|