Remove KeyboardDevice class.

ui/events/devices/x11/device_data_manager_x11.h

 // Copyright 2014 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.
 
 #ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
 #define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
 
 // Generically-named #defines from Xlib is conflicting with symbols in GTest.
 // So many tests .cc file #undef Bool before including device_data_manager.h,
 // which makes Bool unrecognized in XInput2.h.
@@ skipping 259 matching lines @@
   // Returns true if |native_event| should be blocked.
   bool IsEventBlocked(const XEvent& xev);
 
   const std::vector<int>& master_pointers() const {
     return master_pointers_;
   }
 
  protected:
   // DeviceHotplugEventObserver:
   void OnKeyboardDevicesUpdated(
-      const std::vector<KeyboardDevice>& devices) override;
+      const std::vector<InputDevice>& devices) override;
 
  private:
   // Information about scroll valuators
   struct ScrollInfo {
     struct AxisInfo {
       // The scroll valuator number of this scroll axis.
       int number;
       // The scroll increment; a value of n indicates n movement equals one
       // traditional scroll unit.
       double increment;
@@ skipping 85 matching lines @@
   // a specified slot of a device. Defaults to 0 if the valuator for that slot
   // was not specified in an earlier event. With MT-B/XI2.2, valuators in an
   // XEvent are not reported if the values haven't changed from the previous
   // event. So it is necessary to remember these valuators so that chrome
   // doesn't think X/device doesn't know about the valuators. We currently
   // use this only on touchscreen devices.
   std::vector<double> last_seen_valuator_[kMaxDeviceNum][kMaxSlotNum];
 
   // Map that stores meta-data for blocked keyboards. This is needed to restore
   // devices when they are re-enabled.
-  std::map<int, ui::KeyboardDevice> blocked_keyboards_;
+  std::map<int, ui::InputDevice> blocked_keyboards_;

[sky, 2016/05/31 18:13:45]

blocked_keyboard_devices?

[kylechar, 2016/05/31 19:31:12]

Done.

 
   // X11 atoms cache.
   X11AtomCache atom_cache_;
 
   unsigned char button_map_[256];
   int button_map_count_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_