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

Unified Diff: ui/events/event_processor_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/event.cc ('k') | ui/events/event_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_processor_unittest.cc
diff --git a/ui/events/event_processor_unittest.cc b/ui/events/event_processor_unittest.cc
index 7e464fb2b1487a3a8438e6ce5e1b3c151ece304f..34c98e3a753ccc94c25e5b13d34480505489adba 100644
--- a/ui/events/event_processor_unittest.cc
+++ b/ui/events/event_processor_unittest.cc
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/events/event.h"
+
+#include <utility>
#include <vector>
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/events/event.h"
#include "ui/events/event_target_iterator.h"
#include "ui/events/event_targeter.h"
#include "ui/events/event_utils.h"
@@ -63,7 +65,7 @@ TEST_F(EventProcessorTest, Basic) {
child->SetEventTargeter(
make_scoped_ptr(new TestEventTargeter(child.get(), false)));
SetTarget(child.get());
- root()->AddChild(child.Pass());
+ root()->AddChild(std::move(child));
MouseEvent mouse(ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
EventTimeForNow(), EF_NONE, EF_NONE);
@@ -121,7 +123,7 @@ TEST_F(EventProcessorTest, NestedEventProcessing) {
// Add one child to the default event processor used in this test suite.
scoped_ptr<TestEventTarget> child(new TestEventTarget());
SetTarget(child.get());
- root()->AddChild(child.Pass());
+ root()->AddChild(std::move(child));
// Define a second root target and child.
scoped_ptr<EventTarget> second_root_scoped(new TestEventTarget());
@@ -130,11 +132,11 @@ TEST_F(EventProcessorTest, NestedEventProcessing) {
scoped_ptr<TestEventTarget> second_child(new TestEventTarget());
second_root->SetEventTargeter(
make_scoped_ptr(new TestEventTargeter(second_child.get(), false)));
- second_root->AddChild(second_child.Pass());
+ second_root->AddChild(std::move(second_child));
// Define a second event processor which owns the second root.
scoped_ptr<TestEventProcessor> second_processor(new TestEventProcessor());
- second_processor->SetRoot(second_root_scoped.Pass());
+ second_processor->SetRoot(std::move(second_root_scoped));
// Indicate that an event which is dispatched to the child target owned by the
// first event processor should be handled by |target_handler| instead.
@@ -176,7 +178,7 @@ TEST_F(EventProcessorTest, OnEventProcessingFinished) {
scoped_ptr<TestEventTarget> child(new TestEventTarget());
child->set_mark_events_as_handled(true);
SetTarget(child.get());
- root()->AddChild(child.Pass());
+ root()->AddChild(std::move(child));
// Dispatch a mouse event. We expect the event to be seen by the target,
// handled, and we expect OnEventProcessingFinished() to be invoked once.
@@ -196,7 +198,7 @@ TEST_F(EventProcessorTest, OnEventProcessingFinished) {
TEST_F(EventProcessorTest, OnEventProcessingStarted) {
scoped_ptr<TestEventTarget> child(new TestEventTarget());
SetTarget(child.get());
- root()->AddChild(child.Pass());
+ root()->AddChild(std::move(child));
// Dispatch a mouse event. We expect the event to be seen by the target,
// OnEventProcessingStarted() should be called once, and
@@ -238,8 +240,8 @@ TEST_F(EventProcessorTest, DispatchToNextBestTarget) {
// Install a TestEventTargeter which permits bubbling.
root()->SetEventTargeter(
make_scoped_ptr(new TestEventTargeter(grandchild.get(), true)));
- child->AddChild(grandchild.Pass());
- root()->AddChild(child.Pass());
+ child->AddChild(std::move(grandchild));
+ root()->AddChild(std::move(child));
ASSERT_EQ(1u, root()->child_count());
ASSERT_EQ(1u, root()->child_at(0)->child_count());
@@ -312,8 +314,8 @@ TEST_F(EventProcessorTest, HandlerSequence) {
// Install a TestEventTargeter which permits bubbling.
root()->SetEventTargeter(
make_scoped_ptr(new TestEventTargeter(grandchild.get(), true)));
- child->AddChild(grandchild.Pass());
- root()->AddChild(child.Pass());
+ child->AddChild(std::move(grandchild));
+ root()->AddChild(std::move(child));
ASSERT_EQ(1u, root()->child_count());
ASSERT_EQ(1u, root()->child_at(0)->child_count());
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/event_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698