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

ui/events/test/keyboard_layout.cc

Index: ui/events/test/keyboard_layout.cc
diff --git a/ui/events/test/keyboard_layout.cc b/ui/events/test/keyboard_layout.cc
new file mode 100644
index 0000000000000000000000000000000000000000..352fed7c7e5cbe47b70da40db23d6e6bba577346
--- /dev/null
+++ b/ui/events/test/keyboard_layout.cc
@@ -0,0 +1,23 @@
+// Copyright 2016 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 "ui/events/test/keyboard_layout.h"
+
+#if defined(OS_WIN) || defined(OS_MACOSX)
+#include "base/logging.h"
+
+namespace ui {
+
+ScopedKeyboardLayout::ScopedKeyboardLayout(KeyboardLayout layout) {
+  original_layout_ = GetActiveLayout();
+  CHECK(ActivateLayout(GetPlatformKeyboardLayout(layout)));

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

Nit: We normally use CHECK only for security-sensitive issues and temporary
debugging of DCHECKs that are failing.

If you have no reason to expect that ActivateLayout() should fail (which is what
this code says), I would just make it return void and remove the CHECK from
here.  (You can add DCHECKs to the implementation of that function if you want.)

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

Done.

+}
+
+ScopedKeyboardLayout::~ScopedKeyboardLayout() {
+  ActivateLayout(original_layout_);
+}
+
+}  // namespace ui
+
+#endif  // defined(OS_WIN) || defined(OS_MACOSX)