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

chrome/test/remoting/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 "chrome/test/remoting/remote_desktop_browsertest.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/switches.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
 RemoteDesktopBrowserTest::RemoteDesktopBrowserTest()
     : remote_test_helper_(nullptr), extension_(nullptr) {
 }
 
 RemoteDesktopBrowserTest::~RemoteDesktopBrowserTest() {}
 
 void RemoteDesktopBrowserTest::SetUp() {
@@ skipping 355 matching lines @@
   EXPECT_TRUE(HtmlElementVisible("client-reconnect-button"));
   EXPECT_TRUE(HtmlElementVisible("client-finished-me2me-button"));
 
   ClickOnControl("client-finished-me2me-button");
 
   EXPECT_FALSE(HtmlElementVisible("client-dialog"));
 }
 
 void RemoteDesktopBrowserTest::SimulateKeyPressWithCode(
     ui::KeyboardCode keyCode,
-    const std::string& code) {
-  SimulateKeyPressWithCode(keyCode, code, false, false, false, false);
+    const std::string& codeStr) {
+  ui::DomCode code = ui::KeycodeConverter::CodeStringToDomCode(codeStr);
+  SimulateKeyPressWithCode(ui::DomKey(), code, keyCode, false, false, false,
+                           false);
 }
 
 void RemoteDesktopBrowserTest::SimulateKeyPressWithCode(
+    ui::DomKey key,
+    ui::DomCode code,
     ui::KeyboardCode keyCode,
-    const std::string& code,
     bool control,
     bool shift,
     bool alt,
     bool command) {
-  content::SimulateKeyPressWithCode(
-      active_web_contents(),
-      keyCode,
-      code,
-      control,
-      shift,
-      alt,
-      command);
+  content::SimulateKeyPress(active_web_contents(), key, code, keyCode, control,
+                            shift, alt, command);
 }
 
 void RemoteDesktopBrowserTest::SimulateCharInput(char c) {
-  const char* code;
+  const char* codeStr;
   ui::KeyboardCode keyboard_code;
   bool shift;
-  GetKeyValuesFromChar(c, &code, &keyboard_code, &shift);
-  ASSERT_TRUE(code != NULL);
-  SimulateKeyPressWithCode(keyboard_code, code, false, shift, false, false);
+  GetKeyValuesFromChar(c, &codeStr, &keyboard_code, &shift);
+  ui::DomKey key = ui::DomKey::FromCharacter(c);
+  ASSERT_TRUE(codeStr != NULL);
+  ui::DomCode code = ui::KeycodeConverter::CodeStringToDomCode(codeStr);
+  SimulateKeyPressWithCode(key, code, keyboard_code, false, shift, false,
+                           false);
 }
 
 void RemoteDesktopBrowserTest::SimulateStringInput(const std::string& input) {
   for (size_t i = 0; i < input.length(); ++i)
     SimulateCharInput(input[i]);
 }
 
 void RemoteDesktopBrowserTest::SimulateMouseLeftClickAt(int x, int y) {
   SimulateMouseClickAt(0, blink::WebMouseEvent::ButtonLeft, x, y);
 }
@@ skipping 502 matching lines @@
 
   ConditionalTimeoutWaiter homeWaiter(
           base::TimeDelta::FromSeconds(5),
           base::TimeDelta::FromMilliseconds(500),
           base::Bind(&RemoteDesktopBrowserTest::IsAppModeEqualTo,
                      this, "remoting.AppMode.HOME"));
   EXPECT_TRUE(homeWaiter.Wait());
 }
 
 }  // namespace remoting