Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Unified Diff: ui/events/x/events_x_unittest.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/test/test_event_target.cc ('k') | ui/message_center/message_center_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ui/events/test/test_event_target.cc ('k') | ui/message_center/message_center_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698