Revert 222168 "Add a CodeToNativeKeycode helper that converts UI..."

trunk/src/ui/base/keycodes/usb_keycode_map_unittest.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 <map>
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 15 matching lines @@
 #undef USB_KEYMAP
 
 const uint32_t kUsbNonExistentKeycode = 0xffffff;
 const uint32_t kUsbUsBackslash =        0x070031;
 const uint32_t kUsbNonUsHash =          0x070032;
 
 TEST(UsbKeycodeMap, Basic) {
   // Verify that the first element in the table is the "invalid" code.
   EXPECT_EQ(InvalidUsbKeycode(), usb_keycode_map[0].usb_keycode);
   EXPECT_EQ(InvalidNativeKeycode(), usb_keycode_map[0].native_keycode);
-  EXPECT_EQ(InvalidKeyboardEventCode(), "Unidentified");
-  EXPECT_EQ(InvalidNativeKeycode(), CodeToNativeKeycode("Unidentified"));
 
   // Verify that there are no duplicate entries in the mapping.
   std::map<uint32_t, uint16_t> usb_to_native;
   std::map<uint16_t, uint32_t> native_to_usb;
   for (size_t i = 0; i < arraysize(usb_keycode_map); ++i) {
     // Don't test keys with no native keycode mapping on this platform.
     if (usb_keycode_map[i].native_keycode == InvalidNativeKeycode())
       continue;
 
     // Verify UsbKeycodeToNativeKeycode works for this key.
     EXPECT_EQ(usb_keycode_map[i].native_keycode,
               UsbKeycodeToNativeKeycode(usb_keycode_map[i].usb_keycode));
 
-    // Verify CodeToNativeKeycode and NativeKeycodeToCode work correctly.
-    if (usb_keycode_map[i].code) {
-      EXPECT_EQ(usb_keycode_map[i].native_keycode,
-                CodeToNativeKeycode(usb_keycode_map[i].code));
-      EXPECT_EQ(usb_keycode_map[i].code,
-                NativeKeycodeToCode(usb_keycode_map[i].native_keycode));
-    }
-    else {
-      EXPECT_EQ(InvalidNativeKeycode(),
-                CodeToNativeKeycode(usb_keycode_map[i].code));
-    }
-
     // Verify that the USB or native codes aren't duplicated.
     EXPECT_EQ(0U, usb_to_native.count(usb_keycode_map[i].usb_keycode))
         << " duplicate of USB code 0x" << std::hex << std::setfill('0')
         << std::setw(6) << usb_keycode_map[i].usb_keycode
         << " to native 0x"
         << std::setw(4) << usb_keycode_map[i].native_keycode
         << " (previous was 0x"
         << std::setw(4) << usb_to_native[usb_keycode_map[i].usb_keycode]
         << ")";
     usb_to_native[usb_keycode_map[i].usb_keycode] =
@@ skipping 24 matching lines @@
 
 TEST(UsbKeycodeMap, UsBackslashIsNonUsHash) {
   // Verify that UsbKeycodeToNativeKeycode treats the non-US "hash" key
   // as equivalent to the US "backslash" key.
   EXPECT_EQ(UsbKeycodeToNativeKeycode(kUsbUsBackslash),
             UsbKeycodeToNativeKeycode(kUsbNonUsHash));
 
 }
 
 }  // namespace