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

ui/events/test/keyboard_layout_mac.cc

Index: ui/events/test/keyboard_layout_mac.cc
diff --git a/ui/events/test/keyboard_layout_mac.cc b/ui/events/test/keyboard_layout_mac.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2e120b0337122703ad34dece82cdb11a2503d05b
--- /dev/null
+++ b/ui/events/test/keyboard_layout_mac.cc
@@ -0,0 +1,50 @@
+// 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"
+
+#include "base/logging.h"
+
+namespace ui {
+
+PlatformKeyboardLayout GetPlatformKeyboardLayout(KeyboardLayout layout) {
+  const char* input_source_id;
+  switch (layout) {
+    case KEYBOARD_LAYOUT_ENGLISH_US:
+      input_source_id = "com.apple.keylayout.US";
+      break;
+    case KEYBOARD_LAYOUT_GERMAN:
+      input_source_id = "com.apple.keylayout.German";
+      break;
+    default:
+      NOTREACHED();
+      return PlatformKeyboardLayout();

[Peter Kasting, 2016/08/26 18:54:33]

Nit: I still probably would have tried to avoid handling NOTREACHED, e.g. by
doing

  DCHECK((layout == KEYBOARD_LAYOUT_ENGLISH_US) ||
         (layout == KEYBOARD_LAYOUT_GERMAN));
  const char[] const input_source_id = (layout == KEYBOARD_LAYOUT_ENGLISH_US )
                                           ? "com.apple.keylayout.US"
                                           : "com.apple.keylayout.German";

...which is also noticeably shorter, but it also wouldn't continue to scale up
well if you think there will be more layouts added later.  So up to you.

[Tomasz Moniuszko, 2016/08/31 15:29:42]

Actually, it seems that tests which need German keyboard layout are disabled on
Mac. Comments say it's because they fail if German keyboard layout is not
installed in system. I removed support for German layout then.

+  }
+
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> filter_dict(
+      CFDictionaryCreateMutable(kCFAllocatorDefault, 1,
+                                &kCFTypeDictionaryKeyCallBacks,
+                                &kCFTypeDictionaryValueCallBacks));
+  base::ScopedCFTypeRef<CFStringRef> id_ref(CFStringCreateWithCString(
+      kCFAllocatorDefault, input_source_id, kCFStringEncodingUTF8));
+  CFDictionaryAddValue(filter_dict, kTISPropertyInputSourceID, id_ref);
+  base::ScopedCFTypeRef<CFArrayRef> sources(
+      TISCreateInputSourceList(filter_dict, true));
+  if (CFArrayGetCount(sources) != 1)
+    return PlatformKeyboardLayout();
+
+  return PlatformKeyboardLayout(
+      (TISInputSourceRef)CFArrayGetValueAtIndex(sources, 0));
+}
+
+PlatformKeyboardLayout ScopedKeyboardLayout::GetActiveLayout() {
+  return PlatformKeyboardLayout(TISCopyCurrentKeyboardInputSource());
+}
+
+bool ScopedKeyboardLayout::ActivateLayout(PlatformKeyboardLayout layout) {
+  DCHECK(layout);
+  return TISSelectInputSource(layout) == noErr;
+}
+
+}  // namespace ui