Add a CodeToNativeKeycode helper that converts UIEvent code to native code.

remoting/test/remote_desktop_browsertest.cc

 // Copyright 2013 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 "remote_desktop_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
 
 using extensions::Extension;
 
 namespace remoting {
 
-// BuildSimpleWebKeyEvent and SimulateKeyPress below are adapted from
-// content/public/test/browser_test_utils.cc.
-// TODO: Move this to browser_test_utils.cc after the support is added for
-// the UIEvent key |code|.
-void BuildSimpleWebKeyEvent(WebKit::WebInputEvent::Type type,
-                            ui::KeyboardCode key,
-                            int nativeKeyCode,
-                            bool control,
-                            bool shift,
-                            bool alt,
-                            bool command,
-                            content::NativeWebKeyboardEvent* event) {
-  event->nativeKeyCode = nativeKeyCode;
-  event->windowsKeyCode = key;
-  event->setKeyIdentifierFromWindowsKeyCode();
-  event->type = type;
-  event->modifiers = 0;
-  event->isSystemKey = false;
-  event->timeStampSeconds = base::Time::Now().ToDoubleT();
-  event->skip_in_browser = true;
-
-  if (type == WebKit::WebInputEvent::Char ||
-      type == WebKit::WebInputEvent::RawKeyDown) {
-    event->text[0] = key;
-    event->unmodifiedText[0] = key;
-  }
-
-  if (control)
-    event->modifiers |= WebKit::WebInputEvent::ControlKey;
-
-  if (shift)
-    event->modifiers |= WebKit::WebInputEvent::ShiftKey;
-
-  if (alt)
-    event->modifiers |= WebKit::WebInputEvent::AltKey;
-
-  if (command)
-    event->modifiers |= WebKit::WebInputEvent::MetaKey;
-}
-
-void SimulateKeyPress(content::WebContents* web_contents,
-                      ui::KeyboardCode key,
-                      int nativeKeyCode,
-                      bool control,
-                      bool shift,
-                      bool alt,
-                      bool command) {
-  content::NativeWebKeyboardEvent event_down;
-  BuildSimpleWebKeyEvent(
-      WebKit::WebInputEvent::RawKeyDown,
-      key, nativeKeyCode,
-      control,
-      shift,
-      alt,
-      command,
-      &event_down);
-  web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event_down);
-
-  content::NativeWebKeyboardEvent char_event;
-  BuildSimpleWebKeyEvent(
-      WebKit::WebInputEvent::Char,
-      key, nativeKeyCode,
-      control,
-      shift,
-      alt,
-      command,
-      &char_event);
-  web_contents->GetRenderViewHost()->ForwardKeyboardEvent(char_event);
-
-  content::NativeWebKeyboardEvent event_up;
-  BuildSimpleWebKeyEvent(
-      WebKit::WebInputEvent::KeyUp,
-      key,
-      nativeKeyCode,
-      control,
-      shift,
-      alt,
-      command,
-      &event_up);
-  web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event_up);
-}
-
 RemoteDesktopBrowserTest::RemoteDesktopBrowserTest() {}
 
 RemoteDesktopBrowserTest::~RemoteDesktopBrowserTest() {}
 
 void RemoteDesktopBrowserTest::SetUp() {
   ParseCommandLine();
   ExtensionBrowserTest::SetUp();
 }
 
 // Change behavior of the default host resolver to avoid DNS lookup errors,
@@ skipping 165 matching lines @@
 
   // Starting Me2Me.
   ExecuteScript("remoting.showMe2MeUiAndSave();");
 
   EXPECT_TRUE(HtmlElementVisible("me2me-content"));
   EXPECT_FALSE(HtmlElementVisible("me2me-first-run"));
 }
 
 void RemoteDesktopBrowserTest::SimulateKeyPress(
     ui::KeyboardCode key,
-    int nativeKeyCode) {
-  SimulateKeyPress(key, nativeKeyCode, false, false, false, false);
+    const char* code) {
+  SimulateKeyPress(key, code, false, false, false, false);
 }
 
 void RemoteDesktopBrowserTest::SimulateKeyPress(
     ui::KeyboardCode key,
-    int nativeKeyCode,
+    const char* code,
     bool control,
     bool shift,
     bool alt,
     bool command) {
-  // TODO: Switch to content::SimulateKeyPress when an overload of it is
-  // added to take the UIEvent key |code| string.
-  remoting::SimulateKeyPress(
+  content::SimulateKeyPress(
       browser()->tab_strip_model()->GetActiveWebContents(),
       key,
-      nativeKeyCode,
+      code,
       control,
       shift,
       alt,
       command);
 }
 
 void RemoteDesktopBrowserTest::Install() {
   // TODO: add support for installing unpacked extension (the v2 app needs it).
   if (!NoInstall()) {
     VerifyChromotingLoaded(false);
@@ skipping 212 matching lines @@
   // Wait until the client has connected to the server.
   // This can take a while.
   // TODO: Instead of polling, can we register a callback to
   // remoting.clientSession.onStageChange_?
   while (ExecuteScriptAndExtractBool(
       "remoting.clientSession == null")) {
   }
 }
 
 }  // namespace remoting