Add code and key into the browser test key simulation methods.

content/public/test/browser_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 198 matching lines @@
   *result = reader.ReadToValue(json);
   if (!*result) {
     DLOG(ERROR) << reader.GetErrorMessage();
     return false;
   }
 
   return true;
 }
 
 void BuildSimpleWebKeyEvent(blink::WebInputEvent::Type type,
+                            ui::DomKey key,
+                            ui::DomCode code,
                             ui::KeyboardCode key_code,
-                            int native_key_code,
                             int modifiers,
                             NativeWebKeyboardEvent* event) {
-  event->nativeKeyCode = native_key_code;
+  event->domKey = key;
+  event->domCode = static_cast<int>(code);
+  event->nativeKeyCode = ui::KeycodeConverter::DomCodeToNativeKeycode(code);
   event->windowsKeyCode = key_code;
   event->setKeyIdentifierFromWindowsKeyCode();
   event->type = type;
   event->modifiers = modifiers;
   event->isSystemKey = false;
   event->timeStampSeconds =
       (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
   event->skip_in_browser = true;
 
   if (type == blink::WebInputEvent::Char ||
       type == blink::WebInputEvent::RawKeyDown) {
     event->text[0] = key_code;
     event->unmodifiedText[0] = key_code;
   }
 }
 
 void InjectRawKeyEvent(WebContents* web_contents,
                        blink::WebInputEvent::Type type,
+                       ui::DomKey key,
+                       ui::DomCode code,
                        ui::KeyboardCode key_code,
-                       int native_key_code,
                        int modifiers) {
   NativeWebKeyboardEvent event;
-  BuildSimpleWebKeyEvent(type, key_code, native_key_code, modifiers, &event);
+  BuildSimpleWebKeyEvent(type, key, code, key_code, modifiers, &event);
   WebContentsImpl* web_contents_impl =
       static_cast<WebContentsImpl*>(web_contents);
   RenderWidgetHostImpl* main_frame_rwh =
       web_contents_impl->GetMainFrame()->GetRenderWidgetHost();
   web_contents_impl->GetFocusedRenderWidgetHost(main_frame_rwh)
       ->ForwardKeyboardEvent(event);
 }
 
 void GetCookiesCallback(std::string* cookies_out,
                         base::WaitableEvent* event,
@@ skipping 326 matching lines @@
 #if defined(USE_AURA)
 void SimulateTouchPressAt(WebContents* web_contents, const gfx::Point& point) {
   ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, point, 0, base::TimeDelta());
   static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView())
       ->OnTouchEvent(&touch);
 }
 #endif
 
 void SimulateKeyPress(WebContents* web_contents,
+                      ui::DomKey key,
+                      ui::DomCode code,
                       ui::KeyboardCode key_code,
                       bool control,
                       bool shift,
                       bool alt,
                       bool command) {
-  SimulateKeyPressWithCode(
-      web_contents, key_code, std::string(), control, shift, alt, command);
-}
-
-void SimulateKeyPressWithCode(WebContents* web_contents,
-                              ui::KeyboardCode key_code,
-                              const std::string& code,
-                              bool control,
-                              bool shift,
-                              bool alt,
-                              bool command) {
-  int native_key_code = ui::KeycodeConverter::DomCodeToNativeKeycode(
-      ui::KeycodeConverter::CodeStringToDomCode(code));
-
   int modifiers = 0;
 
   // The order of these key down events shouldn't matter for our simulation.
   // For our simulation we can use either the left keys or the right keys.
   if (control) {
     modifiers |= blink::WebInputEvent::ControlKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_CONTROL,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown,
+                      ui::DomKey::CONTROL, ui::DomCode::CONTROL_LEFT,
+                      ui::VKEY_CONTROL, modifiers);
   }
 
   if (shift) {
     modifiers |= blink::WebInputEvent::ShiftKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_SHIFT,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::SHIFT_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown,
+                      ui::DomKey::SHIFT, ui::DomCode::SHIFT_LEFT,
+                      ui::VKEY_SHIFT, modifiers);
   }
 
   if (alt) {
     modifiers |= blink::WebInputEvent::AltKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_MENU,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown,
+                      ui::DomKey::ALT, ui::DomCode::ALT_LEFT, ui::VKEY_MENU,
+                      modifiers);
   }
 
   if (command) {
     modifiers |= blink::WebInputEvent::MetaKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_COMMAND,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::META_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown,
+                      ui::DomKey::META, ui::DomCode::META_LEFT,
+                      ui::VKEY_COMMAND, modifiers);
   }
-  InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown, key_code,
-                    native_key_code, modifiers);
+  InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown, key, code,
+                    key_code, modifiers);
 
-  InjectRawKeyEvent(web_contents, blink::WebInputEvent::Char, key_code,
-                    native_key_code, modifiers);
+  InjectRawKeyEvent(web_contents, blink::WebInputEvent::Char, key, code,
+                    key_code, modifiers);
 
-  InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp, key_code,
-                    native_key_code, modifiers);
+  InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp, key, code,
+                    key_code, modifiers);
 
   // The order of these key releases shouldn't matter for our simulation.
   if (control) {
     modifiers &= ~blink::WebInputEvent::ControlKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_CONTROL,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp,
+                      ui::DomKey::CONTROL, ui::DomCode::CONTROL_LEFT,
+                      ui::VKEY_CONTROL, modifiers);
   }
 
   if (shift) {
     modifiers &= ~blink::WebInputEvent::ShiftKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_SHIFT,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::SHIFT_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp,
+                      ui::DomKey::SHIFT, ui::DomCode::SHIFT_LEFT,
+                      ui::VKEY_SHIFT, modifiers);
   }
 
   if (alt) {
     modifiers &= ~blink::WebInputEvent::AltKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_MENU,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp,
+                      ui::DomKey::ALT, ui::DomCode::ALT_LEFT, ui::VKEY_MENU,
+                      modifiers);
   }
 
   if (command) {
     modifiers &= ~blink::WebInputEvent::MetaKey;
-    InjectRawKeyEvent(
-        web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_COMMAND,
-        ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::META_LEFT),
-        modifiers);
+    InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp,
+                      ui::DomKey::META, ui::DomCode::META_LEFT,
+                      ui::VKEY_COMMAND, modifiers);
   }
 
   ASSERT_EQ(modifiers, 0);
 }
 
 ToRenderFrameHost::ToRenderFrameHost(WebContents* web_contents)
     : render_frame_host_(web_contents->GetMainFrame()) {
 }
 
 ToRenderFrameHost::ToRenderFrameHost(RenderViewHost* render_view_host)
@@ skipping 592 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (ack_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN)
     return ack_result_;
   base::RunLoop run_loop;
   base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
   run_loop.Run();
   return ack_result_;
 }
 
 }  // namespace content