Remove ui::KeycodeConverter::CodeToNativeKeycode().

ui/events/keycodes/dom4/keycode_converter_unittest.cc

 // Copyright 2013 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/dom4/keycode_converter.h"
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 19 matching lines @@
 const uint32_t kUsbNonUsHash =          0x070032;
 
 TEST(UsbKeycodeMap, Basic) {
   // Verify that the first element in the table is the "invalid" code.
   const ui::KeycodeMapEntry* keycode_map =
       ui::KeycodeConverter::GetKeycodeMapForTest();
   EXPECT_EQ(ui::KeycodeConverter::InvalidUsbKeycode(),
             keycode_map[0].usb_keycode);
   EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
             keycode_map[0].native_keycode);
-  EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
-            ui::KeycodeConverter::CodeToNativeKeycode("Unidentified"));
+  EXPECT_EQ(
+      ui::KeycodeConverter::InvalidNativeKeycode(),
+      ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::NONE));
 
   // 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;
   size_t numEntries = ui::KeycodeConverter::NumKeycodeMapEntriesForTest();
   for (size_t i = 0; i < numEntries; ++i) {
     const ui::KeycodeMapEntry* entry = &keycode_map[i];
     // Don't test keys with no native keycode mapping on this platform.
     if (entry->native_keycode == ui::KeycodeConverter::InvalidNativeKeycode())
       continue;
 
     // Verify UsbKeycodeToNativeKeycode works for this key.
     EXPECT_EQ(
         entry->native_keycode,
         ui::KeycodeConverter::UsbKeycodeToNativeKeycode(entry->usb_keycode));
 
-    // Verify CodeToNativeKeycode and NativeKeycodeToCode work correctly.
+    // Verify DomCodeToNativeKeycode and NativeKeycodeToCode work correctly.
+    ui::DomCode dom_code =
+        ui::KeycodeConverter::CodeStringToDomCode(entry->code);

[Wez, 2015/05/05 20:11:48]

You only need this because you're testing DomCode->native and
native->DomCodeString - if you also switch to native->DomCode->DomCodeString
flow then this test will be simpler, with no need to deal w/ the string form
(and you could then test the DomCode<->DomCodeString mapping separately).

[kpschoedel, 2015/05/05 20:48:50]

Done. (DomCode<->DomCodeString is tested in KeycodeConverter.DomCode below)

     if (entry->code) {
       EXPECT_EQ(entry->native_keycode,
-                ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
-      EXPECT_STREQ(
-          entry->code,
-          ui::KeycodeConverter::NativeKeycodeToCode(entry->native_keycode));
-    }
-    else {
-      EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
-                ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
+                ui::KeycodeConverter::DomCodeToNativeKeycode(dom_code));
+      EXPECT_STREQ(entry->code, ui::KeycodeConverter::NativeKeycodeToCode(
+                                    entry->native_keycode));

[Wez, 2015/05/05 20:11:48]

nit: More readable to wrap after "code," and keep the NativeKeycodeToCode() call
on a single line?

[kpschoedel, 2015/05/05 20:48:50]

Agreed — I liked the old clang-format rule better — but the line is gone now.

+    } else {
+      EXPECT_EQ(ui::DomCode::NONE, dom_code);
     }
 
     // Verify that the USB or native codes aren't duplicated.
     EXPECT_EQ(0U, usb_to_native.count(entry->usb_keycode))
         << " duplicate of USB code 0x" << std::hex << std::setfill('0')
         << std::setw(6) << entry->usb_keycode
         << " to native 0x"
         << std::setw(4) << entry->native_keycode
         << " (previous was 0x"
         << std::setw(4) << usb_to_native[entry->usb_keycode]
@@ skipping 67 matching lines @@
     ui::DomKey key = ui::KeycodeConverter::KeyStringToDomKey(s);
     if (s) {
       EXPECT_STREQ(s, ui::KeycodeConverter::DomKeyToKeyString(key));
     } else {
       EXPECT_EQ(ui::DomKey::NONE, key);
     }
   }
 }
 
 }  // namespace