Index: ui/events/devices/x11/device_data_manager_x11_unittest.cc |
diff --git a/ui/events/devices/x11/device_data_manager_x11_unittest.cc b/ui/events/devices/x11/device_data_manager_x11_unittest.cc |
index 8149111e19100644df1226a2257cfcc8e060f2a7..75a43d147a781adc0c80c1ca82b1a3e76d49e1ef 100644 |
--- a/ui/events/devices/x11/device_data_manager_x11_unittest.cc |
+++ b/ui/events/devices/x11/device_data_manager_x11_unittest.cc |
@@ -80,10 +80,10 @@ TEST_F(DeviceDataManagerX11Test, NotifyOnDisable) { |
DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance(); |
TestInputDeviceObserver observer(manager); |
std::vector<ui::KeyboardDevice> keyboards; |
- keyboards.push_back(ui::KeyboardDevice( |
- 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
- keyboards.push_back(ui::KeyboardDevice( |
- 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
+ keyboards.push_back( |
+ ui::KeyboardDevice(1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
+ keyboards.push_back( |
+ ui::KeyboardDevice(2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
SetKeyboardDevices(keyboards); |
EXPECT_TRUE(observer.change_notified()); |
std::vector<KeyboardDevice> devices = manager->keyboard_devices(); |
@@ -111,10 +111,10 @@ TEST_F(DeviceDataManagerX11Test, TestMultipleDisable) { |
DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance(); |
TestInputDeviceObserver observer(manager); |
std::vector<ui::KeyboardDevice> keyboards; |
- keyboards.push_back(ui::KeyboardDevice( |
- 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
- keyboards.push_back(ui::KeyboardDevice( |
- 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
+ keyboards.push_back( |
+ ui::KeyboardDevice(1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
+ keyboards.push_back( |
+ ui::KeyboardDevice(2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
SetKeyboardDevices(keyboards); |
EXPECT_TRUE(observer.change_notified()); |
std::vector<KeyboardDevice> devices = manager->keyboard_devices(); |
@@ -150,10 +150,10 @@ TEST_F(DeviceDataManagerX11Test, UnblockOnDeviceUnplugged) { |
DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance(); |
TestInputDeviceObserver observer(manager); |
std::vector<ui::KeyboardDevice> all_keyboards; |
- all_keyboards.push_back(ui::KeyboardDevice( |
- 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
- all_keyboards.push_back(ui::KeyboardDevice( |
- 2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
+ all_keyboards.push_back( |
+ ui::KeyboardDevice(1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
+ all_keyboards.push_back( |
+ ui::KeyboardDevice(2u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
SetKeyboardDevices(all_keyboards); |
EXPECT_TRUE(observer.change_notified()); |
std::vector<KeyboardDevice> devices = manager->keyboard_devices(); |
@@ -168,8 +168,8 @@ TEST_F(DeviceDataManagerX11Test, UnblockOnDeviceUnplugged) { |
// Unplug the disabled device. Should not be notified, since the active list |
// did not change. |
std::vector<ui::KeyboardDevice> subset_keyboards; |
- subset_keyboards.push_back(ui::KeyboardDevice( |
- 1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); |
+ subset_keyboards.push_back( |
+ ui::KeyboardDevice(1u, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); |
SetKeyboardDevices(subset_keyboards); |
EXPECT_FALSE(observer.change_notified()); |
// Replug in the first device. Should be notified of the new device. |