Remove keyIdentifier.

content/browser/devtools/protocol/devtools_protocol_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 <stddef.h>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 204 matching lines @@
   std::string waiting_for_notification_;
   int waiting_for_command_result_id_;
   bool in_dispatch_;
 };
 
 class SyntheticKeyEventTest : public DevToolsProtocolTest {
  protected:
   void SendKeyEvent(const std::string& type,
                     int modifier,
                     int windowsKeyCode,
-                    int nativeKeyCode) {
+                    int nativeKeyCode,
+                    const std::string& key) {
     std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
     params->SetString("type", type);
     params->SetInteger("modifiers", modifier);
     params->SetInteger("windowsVirtualKeyCode", windowsKeyCode);
     params->SetInteger("nativeVirtualKeyCode", nativeKeyCode);
+    params->SetString("key", key);
     SendCommand("Input.dispatchKeyEvent", std::move(params));
   }
 };
 
-IN_PROC_BROWSER_TEST_F(SyntheticKeyEventTest, KeyEventSynthesizeKeyIdentifier) {
+IN_PROC_BROWSER_TEST_F(SyntheticKeyEventTest, KeyEventSynthesizeKey) {
   NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
   Attach();
   ASSERT_TRUE(content::ExecuteScript(
       shell()->web_contents()->GetRenderViewHost(),
       "function handleKeyEvent(event) {"
         "domAutomationController.setAutomationId(0);"
-        "domAutomationController.send(event.keyIdentifier);"
+        "domAutomationController.send(event.key);"
       "}"
       "document.body.addEventListener('keydown', handleKeyEvent);"
       "document.body.addEventListener('keyup', handleKeyEvent);"));
 
   DOMMessageQueue dom_message_queue;
 
   // Send enter (keycode 13).
-  SendKeyEvent("rawKeyDown", 0, 13, 13);
-  SendKeyEvent("keyUp", 0, 13, 13);
+  SendKeyEvent("rawKeyDown", 0, 13, 13, "Enter");
+  SendKeyEvent("keyUp", 0, 13, 13, "Enter");
 
-  std::string key_identifier;
-  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key_identifier));
-  EXPECT_EQ("\"Enter\"", key_identifier);
-  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key_identifier));
-  EXPECT_EQ("\"Enter\"", key_identifier);
+  std::string key;
+  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key));
+  EXPECT_EQ("\"Enter\"", key);
+  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key));
+  EXPECT_EQ("\"Enter\"", key);
 
   // Send escape (keycode 27).
-  SendKeyEvent("rawKeyDown", 0, 27, 27);
-  SendKeyEvent("keyUp", 0, 27, 27);
+  SendKeyEvent("rawKeyDown", 0, 27, 27, "Escape");
+  SendKeyEvent("keyUp", 0, 27, 27, "Escape");
 
-  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key_identifier));
-  EXPECT_EQ("\"U+001B\"", key_identifier);
-  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key_identifier));
-  EXPECT_EQ("\"U+001B\"", key_identifier);
+  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key));
+  EXPECT_EQ("\"Escape\"", key);
+  ASSERT_TRUE(dom_message_queue.WaitForMessage(&key));
+  EXPECT_EQ("\"Escape\"", key);
 }
 
 class CaptureScreenshotTest : public DevToolsProtocolTest {
  private:
 #if !defined(OS_ANDROID)
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnablePixelOutputInTests);
   }
 #endif
 };
@@ skipping 301 matching lines @@
   shell()->web_contents()->SetDelegate(&dialog_manager);
   SendCommand("Page.enable", nullptr, true);
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetString("expression", "alert('alert')");
   SendCommand("Runtime.evaluate", std::move(params), false);
   WaitForNotification("Page.javascriptDialogOpening");
   dialog_manager.Handle();
 }
 
 }  // namespace content