Index: content/browser/renderer_host/input/touch_event_queue_unittest.cc |
diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc |
index 392d82290a0c965588a15e7fa447c92a5314adf6..f1091d48172843a104c0f560fdd6cbd922fc64bb 100644 |
--- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc |
+++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc |
@@ -2,7 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "content/browser/renderer_host/input/touch_event_queue.h" |
+ |
#include <stddef.h> |
+#include <utility> |
#include "base/location.h" |
#include "base/logging.h" |
@@ -11,7 +14,6 @@ |
#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
#include "content/browser/renderer_host/input/timeout_monitor.h" |
-#include "content/browser/renderer_host/input/touch_event_queue.h" |
#include "content/common/input/synthetic_web_input_event_builders.h" |
#include "content/common/input/web_touch_event_traits.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -58,7 +60,7 @@ class TouchEventQueueTest : public testing::Test, |
sent_events_.push_back(event.event); |
sent_events_ids_.push_back(event.event.uniqueTouchEventId); |
if (sync_ack_result_) { |
- auto sync_ack_result = sync_ack_result_.Pass(); |
+ auto sync_ack_result = std::move(sync_ack_result_); |
SendTouchEventAck(*sync_ack_result); |
} |
} |
@@ -70,12 +72,12 @@ class TouchEventQueueTest : public testing::Test, |
last_acked_event_state_ = ack_result; |
if (followup_touch_event_) { |
scoped_ptr<WebTouchEvent> followup_touch_event = |
- followup_touch_event_.Pass(); |
+ std::move(followup_touch_event_); |
SendTouchEvent(*followup_touch_event); |
} |
if (followup_gesture_event_) { |
scoped_ptr<WebGestureEvent> followup_gesture_event = |
- followup_gesture_event_.Pass(); |
+ std::move(followup_gesture_event_); |
queue_->OnGestureScrollEvent( |
GestureEventWithLatencyInfo(*followup_gesture_event, |
ui::LatencyInfo())); |