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

chrome/browser/autofill/autofill_interactive_uitest.cc

 // Copyright (c) 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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 35 matching lines @@
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 static const char kDataURIPrefix[] = "data:text/html;charset=utf-8,";
 static const char kTestFormString[] =
     "<form action=\"http://www.example.com/\" method=\"POST\">"
     "<label for=\"firstname\">First name:</label>"
@@ skipping 213 matching lines @@
     AddTestProfile(browser(), profile);
   }
 
   // Populates a webpage form using autofill data and keypress events.
   // This function focuses the specified input field in the form, and then
   // sends keypress events to the tab to cause the form to be populated.
   void PopulateForm(const std::string& field_id) {
     std::string js("document.getElementById('" + field_id + "').focus();");
     ASSERT_TRUE(content::ExecuteScript(GetRenderViewHost(), js));
 
-    SendKeyToPageAndWait(ui::VKEY_DOWN);
-    SendKeyToPopupAndWait(ui::VKEY_DOWN);
-    SendKeyToPopupAndWait(ui::VKEY_RETURN);
+    SendKeyToPageAndWait(ui::DomKey::ARROW_DOWN);
+    SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
+    SendKeyToPopupAndWait(ui::DomKey::ENTER);
   }
 
   void ExpectFieldValue(const std::string& field_name,
                         const std::string& expected_value) {
     std::string value;
     ASSERT_TRUE(content::ExecuteScriptAndExtractString(
         GetWebContents(),
         "window.domAutomationController.send("
         "    document.getElementById('" + field_name + "').value);",
         &value));
@@ skipping 117 matching lines @@
     ExpectFieldValue("lastname", "Waddams");
     ExpectFieldValue("address1", "4120 Freidrich Lane");
     ExpectFieldValue("address2", "Basement");
     ExpectFieldValue("city", "Austin");
     ExpectFieldValue("state", "TX");
     ExpectFieldValue("zip", "78744");
     ExpectFieldValue("country", "US");
     ExpectFieldValue("phone", "5125551234");
   }
 
-  void SendKeyToPageAndWait(ui::KeyboardCode key) {
+  void SendKeyToPageAndWait(ui::DomKey key) {
+    ui::KeyboardCode key_code = ui::NonPrintableDomKeyToKeyboardCode(key);
+    ui::DomCode code = ui::UsLayoutKeyboardCodeToDomCode(key_code);
+    SendKeyToPageAndWait(key, code, key_code);
+  }
+
+  void SendKeyToPageAndWait(ui::DomKey key,
+                            ui::DomCode code,
+                            ui::KeyboardCode key_code) {
     test_delegate_.Reset();
-    content::SimulateKeyPress(
-        GetWebContents(), key, false, false, false, false);
+    content::SimulateKeyPress(GetWebContents(), key, code, key_code, false,
+                              false, false, false);
     test_delegate_.Wait();
   }
 
   void PasteStringAndWait(const std::string& pastedata) {
     {
       ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
       writer.WriteText(base::ASCIIToUTF16(pastedata));
     }
     test_delegate_.Reset();
     GetWebContents()->Paste();
     test_delegate_.WaitForTextChange();
   }
 
   bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event) {
     return true;
   }
 
-  void SendKeyToPopupAndWait(ui::KeyboardCode key) {
+  void SendKeyToPopupAndWait(ui::DomKey key) {
+    ui::KeyboardCode key_code = ui::NonPrintableDomKeyToKeyboardCode(key);
+    ui::DomCode code = ui::UsLayoutKeyboardCodeToDomCode(key_code);
+    SendKeyToPopupAndWait(key, code, key_code);
+  }
+
+  void SendKeyToPopupAndWait(ui::DomKey key,
+                             ui::DomCode code,
+                             ui::KeyboardCode key_code) {
     // Route popup-targeted key presses via the render view host.
     content::NativeWebKeyboardEvent event;
-    event.windowsKeyCode = key;
+    event.windowsKeyCode = key_code;
+    event.domCode = static_cast<int>(code);
+    event.domKey = key;
     event.type = blink::WebKeyboardEvent::RawKeyDown;
     test_delegate_.Reset();
     // Install the key press event sink to ensure that any events that are not
     // handled by the installed callbacks do not end up crashing the test.
     GetRenderViewHost()->GetWidget()->AddKeyPressEventCallback(
         key_press_event_sink_);
     GetRenderViewHost()->GetWidget()->ForwardKeyboardEvent(event);
     test_delegate_.Wait();
     GetRenderViewHost()->GetWidget()->RemoveKeyPressEventCallback(
         key_press_event_sink_);
   }
 
+  void SendKeyToDataListPopup(ui::DomKey key) {
+    ui::KeyboardCode key_code = ui::NonPrintableDomKeyToKeyboardCode(key);
+    ui::DomCode code = ui::UsLayoutKeyboardCodeToDomCode(key_code);
+    SendKeyToDataListPopup(key, code, key_code);
+  }
+
   // Datalist does not support autofill preview. There is no need to start
   // message loop for Datalist.
-  void SendKeyToDataListPopup(ui::KeyboardCode key) {
+  void SendKeyToDataListPopup(ui::DomKey key,
+                              ui::DomCode code,
+                              ui::KeyboardCode key_code) {
     // Route popup-targeted key presses via the render view host.
     content::NativeWebKeyboardEvent event;
-    event.windowsKeyCode = key;
+    event.windowsKeyCode = key_code;
+    event.domCode = static_cast<int>(code);
+    event.domKey = key;
     event.type = blink::WebKeyboardEvent::RawKeyDown;
     // Install the key press event sink to ensure that any events that are not
     // handled by the installed callbacks do not end up crashing the test.
     GetRenderViewHost()->GetWidget()->AddKeyPressEventCallback(
         key_press_event_sink_);
     GetRenderViewHost()->GetWidget()->ForwardKeyboardEvent(event);
     GetRenderViewHost()->GetWidget()->RemoveKeyPressEventCallback(
         key_press_event_sink_);
   }
 
   void TryBasicFormFill() {
     FocusFirstNameField();
 
     // Start filling the first name field with "M" and wait for the popup to be
     // shown.
-    SendKeyToPageAndWait(ui::VKEY_M);
+    SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                         ui::VKEY_M);
 
     // Press the down arrow to select the suggestion and preview the autofilled
     // form.
-    SendKeyToPopupAndWait(ui::VKEY_DOWN);
+    SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
     // The previewed values should not be accessible to JavaScript.
     ExpectFieldValue("firstname", "M");
     ExpectFieldValue("lastname", std::string());
     ExpectFieldValue("address1", std::string());
     ExpectFieldValue("address2", std::string());
     ExpectFieldValue("city", std::string());
     ExpectFieldValue("state", std::string());
     ExpectFieldValue("zip", std::string());
     ExpectFieldValue("country", std::string());
     ExpectFieldValue("phone", std::string());
     // TODO(isherman): It would be nice to test that the previewed values are
     // displayed: http://crbug.com/57220
 
     // Press Enter to accept the autofill suggestions.
-    SendKeyToPopupAndWait(ui::VKEY_RETURN);
+    SendKeyToPopupAndWait(ui::DomKey::ENTER);
 
     // The form should be filled.
     ExpectFilledTestForm();
   }
 
   AutofillManagerTestDelegateImpl* test_delegate() { return &test_delegate_; }
 
  private:
   AutofillManagerTestDelegateImpl test_delegate_;
 
@@ skipping 40 matching lines @@
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
-  SendKeyToPageAndWait(ui::VKEY_DOWN);
+  SendKeyToPageAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // crbug.com/516052
 #if defined(OS_CHROMEOS)
 #define MAYBE_AutofillSelectViaTab DISABLED_AutofillSelectViaTab
 #else
 #define MAYBE_AutofillSelectViaTab AutofillSelectViaTab
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_AutofillSelectViaTab) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
-  SendKeyToPageAndWait(ui::VKEY_DOWN);
+  SendKeyToPageAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press tab to accept the autofill suggestions.
-  SendKeyToPopupAndWait(ui::VKEY_TAB);
+  SendKeyToPopupAndWait(ui::DomKey::TAB);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // crbug.com/516052
 #if defined(OS_CHROMEOS)
 #define MAYBE_AutofillViaClick DISABLED_AutofillViaClick
 #else
 #define MAYBE_AutofillViaClick AutofillViaClick
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_AutofillViaClick) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
       browser(), GURL(std::string(kDataURIPrefix) + kTestFormString)));
   // Focus a fillable field.
   ASSERT_NO_FATAL_FAILURE(FocusFirstNameField());
 
   // Now click it.
   test_delegate()->Reset();
   ASSERT_NO_FATAL_FAILURE(ClickFirstNameField());
   test_delegate()->Wait();
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // Makes sure that the first click does *not* activate the popup.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, DontAutofillForFirstClick) {
   CreateTestProfile();
 
   // Load the test page.
@@ skipping 48 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        MAYBE_OnDeleteValueAfterAutofill) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke and accept the Autofill popup and verify the form was filled.
   FocusFirstNameField();
-  SendKeyToPageAndWait(ui::VKEY_M);
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
   ExpectFilledTestForm();
 
   // Delete the value of a filled field.
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.getElementById('firstname').value = '';"));
   ExpectFieldValue("firstname", "");
 
   // Invoke and accept the Autofill popup and verify the field was filled.
-  SendKeyToPageAndWait(ui::VKEY_M);
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
   ExpectFieldValue("firstname", "Milton");
 }
 
 // Test that an input field is not rendered with the yellow autofilled
 // background color when choosing an option from the datalist suggestion list.
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
 // Flakily triggers and assert on Mac; flakily gets empty string instead
 // of "Adam" on ChromeOS.
 // http://crbug.com/419868, http://crbug.com/595385.
 #define MAYBE_OnSelectOptionFromDatalist DISABLED_OnSelectOptionFromDatalist
@@ skipping 12 matching lines @@
            "  <datalist id=\"dl\">"
            "  <option value=\"Adam\"></option>"
            "  <option value=\"Bob\"></option>"
            "  <option value=\"Carl\"></option>"
            "  </datalist>"
            "</form>")));
   std::string orginalcolor;
   GetFieldBackgroundColor("firstname", &orginalcolor);
 
   FocusFirstNameField();
-  SendKeyToPageAndWait(ui::VKEY_DOWN);
-  SendKeyToDataListPopup(ui::VKEY_DOWN);
-  SendKeyToDataListPopup(ui::VKEY_RETURN);
+  SendKeyToPageAndWait(ui::DomKey::ARROW_DOWN);
+  SendKeyToDataListPopup(ui::DomKey::ARROW_DOWN);
+  SendKeyToDataListPopup(ui::DomKey::ENTER);
   ExpectFieldValue("firstname", "Adam");
   std::string color;
   GetFieldBackgroundColor("firstname", &color);
   EXPECT_EQ(color, orginalcolor);
 }
 
 // Test that a JavaScript oninput event is fired after auto-filling a form.
 // Flakily times out on ChromeOS http://crbug.com/585885
 #if defined(OS_CHROMEOS)
 #define MAYBE_OnInputAfterAutofill DISABLED_OnInputAfterAutofill
@@ skipping 26 matching lines @@
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString + kOnInputScript)));
 
   // Invoke Autofill.
   FocusFirstNameField();
 
   // Start filling the first name field with "M" and wait for the popup to be
   // shown.
-  SendKeyToPageAndWait(ui::VKEY_M);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
 
   // The form should be filled.
   ExpectFilledTestForm();
 
   bool focused_fired = false;
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       GetRenderViewHost(),
@@ skipping 50 matching lines @@
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString + kOnChangeScript)));
 
   // Invoke Autofill.
   FocusFirstNameField();
 
   // Start filling the first name field with "M" and wait for the popup to be
   // shown.
-  SendKeyToPageAndWait(ui::VKEY_M);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 
   // Press Enter to accept the autofill suggestions.
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
 
   // The form should be filled.
   ExpectFilledTestForm();
 
   bool focused_fired = false;
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       GetRenderViewHost(),
@@ skipping 44 matching lines @@
       "document.getElementById('country').onchange = recordSelectElementEvent;"
       "</script>";
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString +
            kInputFiresBeforeChangeScript)));
 
   // Invoke and accept the Autofill popup and verify the form was filled.
   FocusFirstNameField();
-  SendKeyToPageAndWait(ui::VKEY_M);
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
-  SendKeyToPopupAndWait(ui::VKEY_RETURN);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ENTER);
   ExpectFilledTestForm();
 
   int num_input_element_events = -1;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       GetRenderViewHost(),
       "domAutomationController.send(inputElementEvents.length);",
       &num_input_element_events));
   EXPECT_EQ(2, num_input_element_events);
 
   std::vector<std::string> input_element_events;
@@ skipping 688 matching lines @@
                        MAYBE_DisableAutocompleteWhileFilling) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill: Start filling the first name field with "M" and wait for
   // the popup to be shown.
   FocusFirstNameField();
-  SendKeyToPageAndWait(ui::VKEY_M);
+  SendKeyToPageAndWait(ui::DomKey::FromCharacter('M'), ui::DomCode::US_M,
+                       ui::VKEY_M);
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
-  SendKeyToPopupAndWait(ui::VKEY_DOWN);
+  SendKeyToPopupAndWait(ui::DomKey::ARROW_DOWN);
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        PastedPasswordIsSaved) {
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestPasswordFormString)));
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.getElementById('user').value = 'user';"));
   FocusFieldByName("password");
   PasteStringAndWait("foobar");
 }
 
 }  // namespace autofill