Revert of Ozone support for device special cases in keyboard event rewriting. (patchset #6 id:12000…

ui/events/ozone/evdev/input_device_factory_evdev.cc

Index: ui/events/ozone/evdev/input_device_factory_evdev.cc
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.cc b/ui/events/ozone/evdev/input_device_factory_evdev.cc
index 11a8f1e1f9641426798550e2736544aa302b694b..aded4ec51bdc2e95b079b04ccb2fb1da1011f529 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.cc
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.cc
@@ -101,7 +101,7 @@ scoped_ptr<EventConverterEvdev> CreateConverter(
   // Touchscreen: use TouchEventConverterEvdev.
   if (devinfo.HasTouchscreen()) {
     scoped_ptr<TouchEventConverterEvdev> converter(new TouchEventConverterEvdev(
-        fd, params.path, params.id, type, devinfo, params.dispatcher));
+        fd, params.path, params.id, type, params.dispatcher));
     converter->Initialize(devinfo);
     return converter.Pass();
   }
@@ -423,7 +423,8 @@ void InputDeviceFactoryEvdev::NotifyTouchscreensUpdated() {
   std::vector<TouchscreenDevice> touchscreens;
   for (auto it = converters_.begin(); it != converters_.end(); ++it) {
     if (it->second->HasTouchscreen()) {
-      touchscreens.push_back(TouchscreenDevice(it->second->input_device(),
+      touchscreens.push_back(TouchscreenDevice(
+          it->second->id(), it->second->type(),
           it->second->GetTouchscreenSize(), it->second->GetTouchPoints()));
     }
   }
@@ -435,7 +436,7 @@ void InputDeviceFactoryEvdev::NotifyKeyboardsUpdated() {
   std::vector<KeyboardDevice> keyboards;
   for (auto it = converters_.begin(); it != converters_.end(); ++it) {
     if (it->second->HasKeyboard()) {
-      keyboards.push_back(KeyboardDevice(it->second->input_device()));
+      keyboards.push_back(KeyboardDevice(it->second->id(), it->second->type()));
     }
   }
 
@@ -445,9 +446,8 @@ void InputDeviceFactoryEvdev::NotifyKeyboardsUpdated() {
 void InputDeviceFactoryEvdev::NotifyMouseDevicesUpdated() {
   std::vector<InputDevice> mice;
   for (auto it = converters_.begin(); it != converters_.end(); ++it) {
-    if (it->second->HasMouse()) {
-      mice.push_back(it->second->input_device());
-    }
+    if (it->second->HasMouse())
+      mice.push_back(InputDevice(it->second->id(), it->second->type()));
   }
 
   dispatcher_->DispatchMouseDevicesUpdated(mice);
@@ -456,9 +456,8 @@ void InputDeviceFactoryEvdev::NotifyMouseDevicesUpdated() {
 void InputDeviceFactoryEvdev::NotifyTouchpadDevicesUpdated() {
   std::vector<InputDevice> touchpads;
   for (auto it = converters_.begin(); it != converters_.end(); ++it) {
-    if (it->second->HasTouchpad()) {
-      touchpads.push_back(it->second->input_device());
-    }
+    if (it->second->HasTouchpad())
+      touchpads.push_back(InputDevice(it->second->id(), it->second->type()));
   }
 
   dispatcher_->DispatchTouchpadDevicesUpdated(touchpads);