events: keycodes: Remove the stateless singleton instance of KeycodeConverter

ui/events/event_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 "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 #include "ui/events/test/events_test_utils.h"
@@ skipping 311 matching lines @@
 }
 
 TEST(EventTest, KeyEventCopy) {
   KeyEvent key(ET_KEY_PRESSED, VKEY_A, EF_NONE);
   scoped_ptr<KeyEvent> copied_key(new KeyEvent(key));
   EXPECT_EQ(copied_key->type(), key.type());
   EXPECT_EQ(copied_key->key_code(), key.key_code());
 }
 
 TEST(EventTest, KeyEventCode) {
-  KeycodeConverter* conv = KeycodeConverter::GetInstance();
-
   const char kCodeForSpace[] = "Space";
-  const uint16 kNativeCodeSpace = conv->CodeToNativeKeycode(kCodeForSpace);
-  ASSERT_NE(conv->InvalidNativeKeycode(), kNativeCodeSpace);
+  const uint16 kNativeCodeSpace =
+      ui::KeycodeConverter::CodeToNativeKeycode(kCodeForSpace);
+  ASSERT_NE(ui::KeycodeConverter::InvalidNativeKeycode(), kNativeCodeSpace);
 
   {
     KeyEvent key(ET_KEY_PRESSED, VKEY_SPACE, kCodeForSpace, EF_NONE);
     EXPECT_EQ(kCodeForSpace, key.code());
   }
   {
     // Regardless the KeyEvent.key_code (VKEY_RETURN), code should be
     // the specified value.
     KeyEvent key(ET_KEY_PRESSED, VKEY_RETURN, kCodeForSpace, EF_NONE);
     EXPECT_EQ(kCodeForSpace, key.code());
@@ skipping 38 matching lines @@
     KeyEvent key(native_event);
 
     // KeyEvent converts from the native keycode (scan code) to the code.
     EXPECT_EQ(kCodeForHome, key.code());
   }
 #endif  // OS_WIN
 }
 
 #if defined(USE_X11) || defined(OS_WIN)
 TEST(EventTest, AutoRepeat) {
-  KeycodeConverter* conv = KeycodeConverter::GetInstance();
-
-  const uint16 kNativeCodeA = conv->CodeToNativeKeycode("KeyA");
-  const uint16 kNativeCodeB = conv->CodeToNativeKeycode("KeyB");
+  const uint16 kNativeCodeA = ui::KeycodeConverter::CodeToNativeKeycode("KeyA");
+  const uint16 kNativeCodeB = ui::KeycodeConverter::CodeToNativeKeycode("KeyB");
 #if defined(USE_X11)
   ScopedXI2Event native_event_a_pressed;
   native_event_a_pressed.InitKeyEvent(ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
   ScopedXI2Event native_event_a_released;
   native_event_a_released.InitKeyEvent(ET_KEY_RELEASED, VKEY_A, kNativeCodeA);
   ScopedXI2Event native_event_b_pressed;
   native_event_b_pressed.InitKeyEvent(ET_KEY_PRESSED, VKEY_B, kNativeCodeB);
   ScopedXI2Event native_event_a_pressed_nonstandard_state;
   native_event_a_pressed_nonstandard_state.InitKeyEvent(
       ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
@@ skipping 37 matching lines @@
   EXPECT_FALSE(key_a4_pressed.IsRepeat());
 
   KeyEvent key_a4_pressed_nonstandard_state(
       native_event_a_pressed_nonstandard_state);
   EXPECT_FALSE(key_a4_pressed_nonstandard_state.IsRepeat());
 #endif
 }
 #endif  // USE_X11 || OS_WIN
 
 }  // namespace ui