Fixing WebKeyboardEvent.

webkit/tools/test_shell/keyboard_unittest.cc

Index: webkit/tools/test_shell/keyboard_unittest.cc
===================================================================
--- webkit/tools/test_shell/keyboard_unittest.cc	(revision 10793)
+++ webkit/tools/test_shell/keyboard_unittest.cc	(working copy)
@@ -14,9 +14,11 @@
 
 #undef LOG
 
+#include "base/string_util.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/webinputevent.h"
+#include "webkit/glue/webinputevent_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using WebCore::PlatformKeyboardEvent;
@@ -46,15 +48,14 @@
   void SetupKeyDownEvent(WebKeyboardEvent* keyboard_event,
                          char key_code,
                          int modifiers) {
-    keyboard_event->key_code = key_code;
+    keyboard_event->windows_key_code = key_code;
     keyboard_event->modifiers = modifiers;
     keyboard_event->type = WebInputEvent::KEY_DOWN;
-#if defined(OS_LINUX)
-    keyboard_event->text = key_code;
-#elif defined(OS_MACOSX)
-    keyboard_event->text.clear();
-    keyboard_event->text.push_back(key_code);
-#endif
+    keyboard_event->text[0] = key_code;
+    std::string key_identifier_str =
+        webkit_glue::GetKeyIdentifierForWindowsKeyCode(key_code);
+    base::strlcpy(keyboard_event->key_identifier, key_identifier_str.c_str(),
+                  kIdentifierLengthCap);
   }
 
   // Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|.