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

chrome/test/chromedriver/keycode_text_conversion_unittest.cc

Index: chrome/test/chromedriver/keycode_text_conversion_unittest.cc
diff --git a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
index 573d1d280562be7e83442313a3cd6c146aafac22..cbf46aadaf01aafe9eb67f637d30b034eeb7beca 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
@@ -9,9 +9,9 @@
 #include "build/build_config.h"
 #include "chrome/test/chromedriver/chrome/ui_events.h"
 #include "chrome/test/chromedriver/keycode_text_conversion.h"
-#include "chrome/test/chromedriver/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/test/keyboard_layout.h"
 
 namespace {
 
@@ -127,14 +127,12 @@ TEST(KeycodeTextConversionTest, MAYBE_CharToKeyCode) {
 #endif
 
 TEST(KeycodeTextConversionTest, MAYBE_NonShiftModifiers) {
-  RestoreKeyboardLayoutOnDestruct restore;
+  ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_GERMAN);
 #if defined(OS_WIN)
-  ASSERT_TRUE(SwitchKeyboardLayout("00000407"));  // german
   int ctrl_and_alt = kControlKeyModifierMask | kAltKeyModifierMask;
   CheckCharToKeyCode('@', ui::VKEY_Q, ctrl_and_alt);
   EXPECT_EQ("@", ConvertKeyCodeToTextNoError(ui::VKEY_Q, ctrl_and_alt));
 #elif defined(OS_MACOSX)
-  ASSERT_TRUE(SwitchKeyboardLayout("com.apple.keylayout.German"));
   EXPECT_EQ("@", ConvertKeyCodeToTextNoError(
       ui::VKEY_L, kAltKeyModifierMask));
 #endif
@@ -149,18 +147,17 @@ TEST(KeycodeTextConversionTest, MAYBE_NonShiftModifiers) {
 #endif
 
 TEST(KeycodeTextConversionTest, MAYBE_NonEnglish) {
-  RestoreKeyboardLayoutOnDestruct restore;
 #if defined(OS_WIN)
-  ASSERT_TRUE(SwitchKeyboardLayout("00000408"));  // greek
+  ui::ScopedKeyboardLayout greek_layout(ui::KEYBOARD_LAYOUT_GREEK);
   CheckCharToKeyCode(';', ui::VKEY_Q, 0);
   EXPECT_EQ(";", ConvertKeyCodeToTextNoError(ui::VKEY_Q, 0));
   // Regression test for chromedriver bug #405.
-  ASSERT_TRUE(SwitchKeyboardLayout("00000419"));  // russian
+  ui::ScopedKeyboardLayout russian_layout(ui::KEYBOARD_LAYOUT_RUSSIAN);

[Peter Kasting, 2016/08/18 17:48:19]

Nit: While it will make no functional difference, if you're not actually trying
to test what happens when you scoped one layout object inside another, I'd give
these separate blocks:

  {
    ui::ScopedKeyboardLayout ...;
    ...
  }
  {
    ui::ScopedKeyboardLayout ...;
    ...
  }

...just to make it very clear where your concern for the first layout ends (e.g.
it's not going to become relevant again later on in the function after the
second layout object goes away).

[Tomasz Moniuszko, 2016/08/26 08:53:12]

Done.

   CheckCharToKeyCode(L'\u0438', ui::VKEY_B, 0);
   EXPECT_EQ(base::UTF16ToUTF8(L"\u0438"),
             ConvertKeyCodeToTextNoError(ui::VKEY_B, 0));
 #elif defined(OS_MACOSX)
-  ASSERT_TRUE(SwitchKeyboardLayout("com.apple.keylayout.German"));
+  ui::ScopedKeyboardLayout german_layout(ui::KEYBOARD_LAYOUT_GERMAN);
   CheckCharToKeyCode('z', ui::VKEY_Y, 0);
   EXPECT_EQ("z", ConvertKeyCodeToTextNoError(ui::VKEY_Y, 0));
 #endif