| Index: ui/events/x/events_x_unittest.cc
|
| diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc
|
| index 065e804e39b6a71d5d35116a4bc34bffe998c630..fb74424240d36286211b51a543899fcefcac1a0a 100644
|
| --- a/ui/events/x/events_x_unittest.cc
|
| +++ b/ui/events/x/events_x_unittest.cc
|
| @@ -553,8 +553,7 @@ TEST_F(EventsXTest, DisableKeyboard) {
|
| EXPECT_EQ(ui::ET_KEY_PRESSED, ui::EventTypeFromNative(xev));
|
|
|
| device_data_manager->EnableDevice(blocked_device_id);
|
| - device_data_manager->SetDisabledKeyboardAllowedKeys(
|
| - scoped_ptr<std::set<KeyboardCode> >());
|
| + device_data_manager->SetDisabledKeyboardAllowedKeys(nullptr);
|
|
|
| // A key returns KEY_PRESSED as per usual now that keyboard was re-enabled.
|
| xev.InitGenericKeyEvent(master_device_id,
|
|
|