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 53a87062720ecdd59ced03fb31091e5a50ee3192..1f782e7182eadc5e7fcecf6d4ea50e9288808d02 100644 |
--- a/ui/events/x/events_x_unittest.cc |
+++ b/ui/events/x/events_x_unittest.cc |
@@ -2,13 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include <cstring> |
-#include <set> |
- |
-#include <X11/extensions/XInput2.h> |
+#include <X11/XKBlib.h> |
#include <X11/Xlib.h> |
#include <X11/Xutil.h> |
-#include <X11/XKBlib.h> |
+#include <X11/extensions/XInput2.h> |
+#include <cstring> |
+#include <set> |
+#include <utility> |
// Generically-named #defines from Xlib that conflict with symbols in GTest. |
#undef Bool |
@@ -378,7 +378,7 @@ TEST_F(EventsXTest, DisableKeyboard) { |
scoped_ptr<std::set<KeyboardCode> > excepted_keys(new std::set<KeyboardCode>); |
excepted_keys->insert(VKEY_B); |
- device_data_manager->SetDisabledKeyboardAllowedKeys(excepted_keys.Pass()); |
+ device_data_manager->SetDisabledKeyboardAllowedKeys(std::move(excepted_keys)); |
ScopedXI2Event xev; |
// A is not allowed on the blocked keyboard, and should return ET_UNKNOWN. |