Revert "Fixed odd behavior for keyboards using the AL_CONSUMER_CONTROL_CONFIG"

ui/events/keycodes/keyboard_code_conversion_x.cc

 // Copyright (c) 2012 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/keycodes/keyboard_code_conversion_x.h"
 
 #include <algorithm>
 
 #define XK_3270  // for XK_3270_BackTab
 #include <X11/XF86keysym.h>
@@ skipping 762 matching lines @@
     case XK_ugrave:
     case XK_Ugrave:
     case XK_brokenbar:
       return VKEY_OEM_102;  // international backslash key in 102 keyboard.
 
     // When evdev is in use, /usr/share/X11/xkb/symbols/inet maps F13-18 keys
     // to the special XF86XK symbols to support Microsoft Ergonomic keyboards:
     // https://bugs.freedesktop.org/show_bug.cgi?id=5783
     // In Chrome, we map these X key symbols back to F13-18 since we don't have
     // VKEYs for these XF86XK symbols.
+    case XF86XK_Tools:
+      return VKEY_F13;
     case XF86XK_Launch5:
       return VKEY_F14;
     case XF86XK_Launch6:
       return VKEY_F15;
     case XF86XK_Launch7:
       return VKEY_F16;
     case XF86XK_Launch8:
       return VKEY_F17;
     case XF86XK_Launch9:
       return VKEY_F18;
@@ skipping 27 matching lines @@
       return VKEY_MEDIA_STOP;
     case XF86XK_AudioPlay:
       return VKEY_MEDIA_PLAY_PAUSE;
     case XF86XK_Mail:
       return VKEY_MEDIA_LAUNCH_MAIL;
     case XF86XK_LaunchA:  // F3 on an Apple keyboard.
       return VKEY_MEDIA_LAUNCH_APP1;
     case XF86XK_LaunchB:  // F4 on an Apple keyboard.
     case XF86XK_Calculator:
       return VKEY_MEDIA_LAUNCH_APP2;
-
-    // XF86XK_Tools is generated from HID Usage AL_CONSUMER_CONTROL_CONFIG
-    // (Usage 0x0183, Page 0x0C) and most commonly launches the OS default
-    // media player (see crbug.com/398345).
-    case XF86XK_Tools:
-      return VKEY_MEDIA_LAUNCH_MEDIA_SELECT;
-
     case XF86XK_WLAN:
       return VKEY_WLAN;
     case XF86XK_PowerOff:
       return VKEY_POWER;
     case XF86XK_Sleep:
       return VKEY_SLEEP;
     case XF86XK_MonBrightnessDown:
       return VKEY_BRIGHTNESS_DOWN;
     case XF86XK_MonBrightnessUp:
       return VKEY_BRIGHTNESS_UP;
@@ skipping 516 matching lines @@
   // alone does not map to XK_less; XKeysymToKeycode() returns KEY_102ND
   // (the '<>' key between Shift and Z on 105-key keyboards) which does.
   //
   // crbug.com/386066 and crbug.com/390263 are examples of problems
   // associated with this.
   //
   return XKeysymToKeycode(display, XKeysymForWindowsKeyCode(key_code, false));
 }
 
 }  // namespace ui