MacViews: Views accelerators table should match the Cocoa one.

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"
 
 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.
-  size_t num_shortcuts = 0;
-  const KeyboardShortcutData *it =
-      GetWindowKeyboardShortcutTable(&num_shortcuts);
-  ASSERT_GT(num_shortcuts, 0U);
-  for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
+  for (const auto& shortcut : GetWindowKeyboardShortcutTable()) {
     int cmd_num = CommandForWindowKeyboardShortcut(
-        it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code, it->key_char);
-    EXPECT_EQ(cmd_num, it->chrome_command);
+        shortcut.command_key, shortcut.shift_key, shortcut.cntrl_key,
+        shortcut.opt_key, shortcut.vkey_code, shortcut.key_char);
+    EXPECT_EQ(cmd_num, shortcut.chrome_command);
   }
 
   // Test that cmd-left and backspace are not window-level commands (else they
   // would be invoked even if e.g. the omnibox had focus, where they really
   // should have text editing functionality).
   EXPECT_EQ(-1, CommandForWindowKeyboardShortcut(
       true, false, false, false, kVK_LeftArrow, 0));
   EXPECT_EQ(-1, CommandForWindowKeyboardShortcut(
       false, false, false, false, kVK_Delete, 0));
 
@@ skipping 63 matching lines @@
   }
 }
 
 TEST(GlobalKeyboardShortcuts, ShortcutsToDelayedWindowCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   EXPECT_EQ(-1,
       CommandForDelayedWindowKeyboardShortcut(false, false, false, false,
                                               0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
-  size_t num_shortcuts = 0;
-  const KeyboardShortcutData *it =
-      GetDelayedWindowKeyboardShortcutTable(&num_shortcuts);
-  ASSERT_GT(num_shortcuts, 0U);
-  for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
+  for (const auto& shortcut : GetDelayedWindowKeyboardShortcutTable()) {
     int cmd_num = CommandForDelayedWindowKeyboardShortcut(
-        it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code, it->key_char);
-    EXPECT_EQ(cmd_num, it->chrome_command);
+        shortcut.command_key, shortcut.shift_key, shortcut.cntrl_key,
+        shortcut.opt_key, shortcut.vkey_code, shortcut.key_char);
+    EXPECT_EQ(cmd_num, shortcut.chrome_command);
   }
 }
 
 TEST(GlobalKeyboardShortcuts, ShortcutsToBrowserCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   EXPECT_EQ(
       -1, CommandForBrowserKeyboardShortcut(false, false, false, false,
                                             0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
-  size_t num_shortcuts = 0;
-  const KeyboardShortcutData *it =
-      GetBrowserKeyboardShortcutTable(&num_shortcuts);
-  ASSERT_GT(num_shortcuts, 0U);
-  for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
+  for (const auto& shortcut : GetBrowserKeyboardShortcutTable()) {
     int cmd_num = CommandForBrowserKeyboardShortcut(
-        it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code, it->key_char);
-    EXPECT_EQ(cmd_num, it->chrome_command);
+        shortcut.command_key, shortcut.shift_key, shortcut.cntrl_key,
+        shortcut.opt_key, shortcut.vkey_code, shortcut.key_char);
+    EXPECT_EQ(cmd_num, shortcut.chrome_command);
   }
 }
 
 NSEvent* KeyEvent(bool command_key, bool shift_key,
                   bool cntrl_key, bool opt_key,
                   NSString* chars, NSString* charsNoMods) {
   NSUInteger modifierFlags = 0;
   if (command_key)
     modifierFlags |= NSCommandKeyMask;
   if (shift_key)
@@ skipping 36 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, @"",  @"")));
 }