Force U.S. English keyboard layout for TextfieldTest.KeysWithModifiersTest

ui/views/controls/textfield/textfield_unittest.cc

Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index affd8dc47159c6d0273660df2bac6fd74e2163d5..bf2f6bc6cd1cc9e9df2cf87e30bed3cd301b7784 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -769,6 +769,12 @@ TEST_F(TextfieldTest, KeyTest) {
 }
 
 TEST_F(TextfieldTest, KeysWithModifiersTest) {
+#if defined(OS_WIN)
+  // Load U.S. English keyboard layout. Modifier keys in other layouts may
+  // change the text inserted into a texfield and cause this test to fail.
+  ::LoadKeyboardLayout(L"00000409", KLF_ACTIVATE);

[Peter Kasting, 2016/08/03 00:13:26]

Don't you need to call ActivateKeyboardLayout() as well?  More generally, can
chrome/test/chromedriver/test_util.cc and here share code somehow, since they
both want to do the same thing?

After that, you probably want to ASSERT that the return value is the locale you
wanted, as current callers of SwitchKeyboardLayout() tend to do.

Nit: :: is unnecessary

[Tomasz Moniuszko, 2016/08/18 15:18:10]

Done. Code is now shared between chromedriver_test, events_unittests and
views_unittests. I also fixed KeyConverter.AllEnglishKeyboardSymbols test which
was also failing with non-English keyboard layout.

+#endif
+
   InitTextfield();
   const int ctrl = ui::EF_CONTROL_DOWN;
   const int alt = ui::EF_ALT_DOWN;