events: keycodes: Remove the stateless singleton instance of KeycodeConverter

remoting/host/input_injector_mac.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 "remoting/host/input_injector.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <Carbon/Carbon.h>
 #include <algorithm>
 
@@ skipping 161 matching lines @@
 
   // |clipboard_| will ignore unknown MIME-types, and verify the data's format.
   clipboard_->InjectClipboardEvent(event);
 }
 
 void InputInjectorMac::Core::InjectKeyEvent(const KeyEvent& event) {
   // HostEventDispatcher should filter events missing the pressed field.
   if (!event.has_pressed() || !event.has_usb_keycode())
     return;
 
-  ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance();
-  int keycode = key_converter->UsbKeycodeToNativeKeycode(event.usb_keycode());
+  int keycode =
+      ui::KeycodeConverter::UsbKeycodeToNativeKeycode(event.usb_keycode());
 
   VLOG(3) << "Converting USB keycode: " << std::hex << event.usb_keycode()
           << " to keycode: " << keycode << std::dec;
 
   // If we couldn't determine the Mac virtual key code then ignore the event.
-  if (keycode == key_converter->InvalidNativeKeycode())
+  if (keycode == ui::KeycodeConverter::InvalidNativeKeycode())
     return;
 
   // If this is a modifier key, remember its new state so that it can be
   // correctly applied to subsequent events.
   if (keycode == kVK_Command) {
     SetOrClearBit(left_modifiers_, kCGEventFlagMaskCommand, event.pressed());
   } else if (keycode == kVK_Shift) {
     SetOrClearBit(left_modifiers_, kCGEventFlagMaskShift, event.pressed());
   } else if (keycode == kVK_Control) {
     SetOrClearBit(left_modifiers_, kCGEventFlagMaskControl, event.pressed());
@@ skipping 135 matching lines @@
 
 }  // namespace
 
 scoped_ptr<InputInjector> InputInjector::Create(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return scoped_ptr<InputInjector>(new InputInjectorMac(main_task_runner));
 }
 
 }  // namespace remoting