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

ui/events/test/keyboard_layout.h

Index: ui/events/test/keyboard_layout.h
diff --git a/ui/events/test/keyboard_layout.h b/ui/events/test/keyboard_layout.h
new file mode 100644
index 0000000000000000000000000000000000000000..9f0470f227ae46ea84fe29fb620468282984d3c7
--- /dev/null
+++ b/ui/events/test/keyboard_layout.h
@@ -0,0 +1,58 @@
+// 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.
+
+#ifndef UI_EVENTS_TEST_KEYBOARD_LAYOUT_H_
+#define UI_EVENTS_TEST_KEYBOARD_LAYOUT_H_
+
+#include "base/macros.h"
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
+#include <windows.h>
+#elif defined(OS_MACOSX) && !defined(OS_IOS)

[Wez, 2016/09/13 20:03:16]

It's strange to have this conditional on OS_MACOSX but !OS_IOS, but then to have
a _mac.cc - won't that therefore get build on iOS, still?

[Tomasz Moniuszko, 2016/09/14 13:56:06]

I haven't tried to compile on iOS after this change. You are right. I'll exclude
_mac.cc file on iOS.

+#include <Carbon/Carbon.h>
+#include "base/mac/scoped_cftyperef.h"
+#endif
+
+namespace ui {
+
+enum KeyboardLayout {
+  KEYBOARD_LAYOUT_ENGLISH_US,
+  KEYBOARD_LAYOUT_FRENCH,
+  KEYBOARD_LAYOUT_GERMAN,
+  KEYBOARD_LAYOUT_GREEK,
+  KEYBOARD_LAYOUT_JAPANESE,
+  KEYBOARD_LAYOUT_KOREAN,
+  KEYBOARD_LAYOUT_RUSSIAN,
+};
+
+#if defined(OS_WIN)
+using PlatformKeyboardLayout = HKL;
+#elif defined(OS_MACOSX) && !defined(OS_IOS)
+using PlatformKeyboardLayout = base::ScopedCFTypeRef<TISInputSourceRef>;
+#else
+// Dummy type for unsupported platforms.

[Wez, 2016/09/13 20:03:16]

Do we need dummy types, or should we simply not define the class at all unless
the platform is a supported one?

[Tomasz Moniuszko, 2016/09/14 13:56:06]

Tests disabled with DISABLED_ prefix still require PlatformKeyboardLayout and
ScopedKeyboardLayout to compile.

+using PlatformKeyboardLayout = void*;
+#endif
+
+PlatformKeyboardLayout GetPlatformKeyboardLayout(KeyboardLayout layout);
+
+// Changes the active keyboard layout for the scope of this object.
+class ScopedKeyboardLayout {
+ public:
+  explicit ScopedKeyboardLayout(KeyboardLayout layout);
+  ~ScopedKeyboardLayout();
+
+ private:
+  static PlatformKeyboardLayout GetActiveLayout();
+  static void ActivateLayout(PlatformKeyboardLayout layout);
+
+  PlatformKeyboardLayout original_layout_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedKeyboardLayout);
+};
+
+}  // namespace ui
+
+#endif  // UI_EVENTS_TEST_KEYBOARD_LAYOUT_H_