MacViews: Fix GlobalKeyboardShortcuts.ShortcutsToWindowCommand.

chrome/browser/global_keyboard_shortcuts_mac_unittest.mm

 // Copyright (c) 2009 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 <AppKit/NSEvent.h>
 #include <Carbon/Carbon.h>
 #include <stddef.h>
 
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/ui_features.h"
 
 TEST(GlobalKeyboardShortcuts, ShortcutsToWindowCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   EXPECT_EQ(
       -1, CommandForWindowKeyboardShortcut(false, false, false, false, 0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
   for (const auto& shortcut : GetWindowKeyboardShortcutTable()) {
     int cmd_num = CommandForWindowKeyboardShortcut(
         shortcut.command_key, shortcut.shift_key, shortcut.cntrl_key,
@@ skipping 13 matching lines @@
   // and IDC_SELECT_PREVIOUS_TAB regardless of the virtual key code values.
   EXPECT_EQ(IDC_SELECT_NEXT_TAB, CommandForWindowKeyboardShortcut(
       true, false, false, false, kVK_ANSI_Period, '}'));
   EXPECT_EQ(IDC_SELECT_PREVIOUS_TAB, CommandForWindowKeyboardShortcut(
       true, true, false, false, kVK_ANSI_Slash, '{'));
 
   // One more test for Cmd-'{' / Alt-8 (on German keyboard layout).
   EXPECT_EQ(IDC_SELECT_PREVIOUS_TAB, CommandForWindowKeyboardShortcut(
       true, false, false, true, kVK_ANSI_8, '{'));
 
+  // On MacViews the IDC_SELECT_TAB_0 accelerator is mapped via the
+  // accelerator_table.cc, which supports mapping using only using keycodes.
+  // The only reason CommandForWindowKeyboardShortcut is necessary on MacViews
+  // is to handle the Cmd-'{' and Cmd-'}', and it doesn't need to handle
+  // IDC_SELECT_TAB_0, so this test could be omitted.
+#if !BUILDFLAG(MAC_VIEWS_BROWSER)
   // Test that switching tabs triggers off keycodes and not characters (visible
   // with the Italian keyboard layout).
   EXPECT_EQ(IDC_SELECT_TAB_0, CommandForWindowKeyboardShortcut(
       true, false, false, false, kVK_ANSI_1, '&'));
+#endif  // !BUILDFLAG(MAC_VIEWS_BROWSER)
 }
 
 TEST(GlobalKeyboardShortcuts, KeypadNumberKeysMatch) {
   // Test that the shortcuts that are generated by keypad number keys match the
   // equivalent keys.
   static const struct {
     int keycode;
     int keypad_keycode;
   } equivalents[] = {
     {kVK_ANSI_0, kVK_ANSI_Keypad0},
@@ skipping 114 matching lines @@
   // cmd-shift-'[' in an RTL context pre 10.9.
   EXPECT_EQ('{', KeyCharacterForEvent(
       KeyEvent(true,  true,  false, false, @"{", @"}")));
   // cmd-shift-'[' in an RTL context on 10.9.
   EXPECT_EQ('{', KeyCharacterForEvent(
       KeyEvent(true,  true,  false, false, @"[", @"}")));
   // Test if getting dead-key events return 0 and do not hang.
   EXPECT_EQ(0,   KeyCharacterForEvent(
       KeyEvent(false, false, false, false, @"",  @"")));
 }