mac: Fix key layout test on OSX 10.9+.

chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 
 #include <Carbon/Carbon.h>
 
 #include <ostream>
 
@@ skipping 311 matching lines @@
       (CFDictionaryRef)filter, true);
   for (id layout in list) {
     TISInputSourceRef ref = (TISInputSourceRef)layout;
 
     NSUInteger keyCode = 0x2e;  // "m" on a US layout and most other layouts.
 
     // On a few layouts, "m" has a different key code.
     NSString* layoutId = (NSString*)TISGetInputSourceProperty(
         ref, kTISPropertyInputSourceID);
     if ([layoutId isEqualToString:@"com.apple.keylayout.Belgian"] ||
-        [layoutId isEqualToString:@"com.apple.keylayout.French"] ||
-        [layoutId isEqualToString:@"com.apple.keylayout.French-numerical"] ||
-        [layoutId isEqualToString:@"com.apple.keylayout.Italian"]) {
+        [layoutId isEqualToString:@"com.apple.keylayout.Italian"] ||
+        [layoutId hasPrefix:@"com.apple.keylayout.French"]) {
       keyCode = 0x29;
     } else if ([layoutId isEqualToString:@"com.apple.keylayout.Turkish"]) {
       keyCode = 0x28;
     } else if ([layoutId isEqualToString:@"com.apple.keylayout.Dvorak-Left"]) {
       keyCode = 0x16;
     } else if ([layoutId isEqualToString:@"com.apple.keylayout.Dvorak-Right"]) {
       keyCode = 0x1a;
     }
 
     EventModifiers modifiers = cmdKey >> 8;
     NSString* chars = keyCodeToCharacter(keyCode, modifiers, ref);
     NSString* charsIgnoringMods = keyCodeToCharacter(keyCode, 0, ref);
     NSEvent* key = KeyEvent(0x100000, chars, charsIgnoringMods, keyCode);
     ExpectKeyFiresItem(key, item, false);
   }
   CFRelease(list);
 }