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

chrome/test/chromedriver/key_converter_unittest.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 <stddef.h>
 
 #include <list>
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/ui_events.h"
 #include "chrome/test/chromedriver/key_converter.h"
-#include "chrome/test/chromedriver/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/test/keyboard_layout.h"
 
 namespace {
 
 void CheckEvents(const base::string16& keys,
                  KeyEvent expected_events[],
                  bool release_modifiers,
                  size_t expected_size,
                  int expected_modifiers) {
   int modifiers = 0;
   std::list<KeyEvent> events;
@@ skipping 129 matching lines @@
       CreateKeyDownEvent(ui::VKEY_UNKNOWN, 0),
       CreateCharEvent(base::WideToUTF8(L"\u00E9"),
                       base::WideToUTF8(L"\u00E9"), 0),
       CreateKeyUpEvent(ui::VKEY_UNKNOWN, 0)};
   CheckEventsReleaseModifiers(base::WideToUTF16(L"\u00E9"),
       event_array, arraysize(event_array));
 }
 
 #if defined(OS_WIN)
 TEST(KeyConverter, NeedsCtrlAndAlt) {
-  RestoreKeyboardLayoutOnDestruct restore;
   int ctrl_and_alt = kControlKeyModifierMask | kAltKeyModifierMask;
   KeyEvent event_array[] = {
       CreateKeyDownEvent(ui::VKEY_CONTROL, 0),
       CreateKeyDownEvent(ui::VKEY_MENU, 0),
       CreateKeyDownEvent(ui::VKEY_Q, ctrl_and_alt),
       CreateCharEvent("q", "@", ctrl_and_alt),
       CreateKeyUpEvent(ui::VKEY_Q, ctrl_and_alt),
       CreateKeyUpEvent(ui::VKEY_MENU, 0),
       CreateKeyUpEvent(ui::VKEY_CONTROL, 0)};
-  ASSERT_TRUE(SwitchKeyboardLayout("00000407"));
+  ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_GERMAN);
   CheckEventsReleaseModifiers("@", event_array, arraysize(event_array));
 }
 #endif
 
 TEST(KeyConverter, UppercaseCharDoesShift) {
   KeyEvent event_array[] = {
       CreateKeyDownEvent(ui::VKEY_SHIFT, 0),
       CreateKeyDownEvent(ui::VKEY_A, kShiftKeyModifierMask),
       CreateCharEvent("a", "A", kShiftKeyModifierMask),
       CreateKeyUpEvent(ui::VKEY_A, kShiftKeyModifierMask),
@@ skipping 85 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // Fails on bots: crbug.com/174962
 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols
 #else
 #define MAYBE_AllEnglishKeyboardSymbols AllEnglishKeyboardSymbols
 #endif
 
 TEST(KeyConverter, MAYBE_AllEnglishKeyboardSymbols) {
+  ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US);
   base::string16 keys;
   const ui::KeyboardCode kSymbolKeyCodes[] = {
       ui::VKEY_OEM_3,
       ui::VKEY_OEM_MINUS,
       ui::VKEY_OEM_PLUS,
       ui::VKEY_OEM_4,
       ui::VKEY_OEM_6,
       ui::VKEY_OEM_5,
       ui::VKEY_OEM_1,
       ui::VKEY_OEM_7,
@@ skipping 113 matching lines @@
           kShiftKeyModifierMask | kControlKeyModifierMask),
       CreateKeyUpEvent(ui::VKEY_SHIFT, 0),
       CreateKeyUpEvent(ui::VKEY_CONTROL, 0)};
   base::string16 keys;
   keys.push_back(static_cast<base::char16>(0xE008U));
   keys.push_back(static_cast<base::char16>(0xE009U));
 
   CheckEvents(keys, event_array, true /* release_modifiers */,
       arraysize(event_array), 0);
 }