Revert of Ozone support for device special cases in keyboard event rewriting.

ash/test/virtual_keyboard_test_helper.cc

Index: ash/test/virtual_keyboard_test_helper.cc
diff --git a/ash/test/virtual_keyboard_test_helper.cc b/ash/test/virtual_keyboard_test_helper.cc
index c920213a3916e7da323fcf88c6abab6ada03c1cb..5cb39dbdb171ae92c10265171bc105f5dbba23d3 100644
--- a/ash/test/virtual_keyboard_test_helper.cc
+++ b/ash/test/virtual_keyboard_test_helper.cc
@@ -17,14 +17,13 @@
   ui::DeviceHotplugEventObserver* manager =
       ui::DeviceDataManager::GetInstance();
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   manager->OnTouchscreenDevicesUpdated(screens);
 
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   manager->OnKeyboardDevicesUpdated(keyboards);
 }