| Index: ui/events/platform/platform_event_source_unittest.cc
|
| diff --git a/ui/events/platform/platform_event_source_unittest.cc b/ui/events/platform/platform_event_source_unittest.cc
|
| index 47ffe18ffa52920b36d5e751e7727869426e3272..dea026932d989dbf2af03416b66bb785c2e7ea59 100644
|
| --- a/ui/events/platform/platform_event_source_unittest.cc
|
| +++ b/ui/events/platform/platform_event_source_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/events/platform/platform_event_source.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| @@ -21,7 +23,7 @@ namespace {
|
| scoped_ptr<PlatformEvent> CreatePlatformEvent() {
|
| scoped_ptr<PlatformEvent> event(new PlatformEvent());
|
| memset(event.get(), 0, sizeof(PlatformEvent));
|
| - return event.Pass();
|
| + return event;
|
| }
|
|
|
| template <typename T>
|
| @@ -564,7 +566,7 @@ class DestroyScopedHandleDispatcher : public TestPlatformEventDispatcher {
|
| ~DestroyScopedHandleDispatcher() override {}
|
|
|
| void SetScopedHandle(scoped_ptr<ScopedEventDispatcher> handler) {
|
| - handler_ = handler.Pass();
|
| + handler_ = std::move(handler);
|
| }
|
|
|
| void set_callback(const base::Closure& callback) {
|
| @@ -601,9 +603,9 @@ class DestroyedNestedOverriddenDispatcherQuitsNestedLoopIteration
|
| TestPlatformEventDispatcher* dispatcher) {
|
| ScopedVector<PlatformEvent> events;
|
| scoped_ptr<PlatformEvent> event(CreatePlatformEvent());
|
| - events.push_back(event.Pass());
|
| + events.push_back(std::move(event));
|
| event = CreatePlatformEvent();
|
| - events.push_back(event.Pass());
|
| + events.push_back(std::move(event));
|
|
|
| // Attempt to dispatch a couple of events. Dispatching the first event will
|
| // have terminated the ScopedEventDispatcher object, which will terminate
|
| @@ -647,7 +649,7 @@ class DestroyedNestedOverriddenDispatcherQuitsNestedLoopIteration
|
| EXPECT_EQ(20, list[1]);
|
| list.clear();
|
|
|
| - overriding.SetScopedHandle(override_handle.Pass());
|
| + overriding.SetScopedHandle(std::move(override_handle));
|
| base::RunLoop run_loop;
|
| base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
|
| base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
|
| @@ -708,7 +710,7 @@ class ConsecutiveOverriddenDispatcherInTheSameMessageLoopIteration
|
| EXPECT_EQ(70, (*list)[1]);
|
| list->clear();
|
|
|
| - second_overriding.SetScopedHandle(second_override_handle.Pass());
|
| + second_overriding.SetScopedHandle(std::move(second_override_handle));
|
| second_overriding.set_post_dispatch_action(POST_DISPATCH_NONE);
|
| base::RunLoop run_loop;
|
| second_overriding.set_callback(run_loop.QuitClosure());
|
|
|