diff options
Diffstat (limited to 'chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc')
-rw-r--r-- | chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc b/chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc index 0c49a847578..c4b6d9600ab 100644 --- a/chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc +++ b/chromium/content/browser/renderer_host/input/gesture_event_queue_unittest.cc @@ -31,22 +31,22 @@ class GestureEventQueueTest : public testing::Test, : acked_gesture_event_count_(0), sent_gesture_event_count_(0) {} - virtual ~GestureEventQueueTest() {} + ~GestureEventQueueTest() override {} // testing::Test - virtual void SetUp() OVERRIDE { + void SetUp() override { queue_.reset(new GestureEventQueue(this, this, DefaultConfig())); } - virtual void TearDown() OVERRIDE { + void TearDown() override { // Process all pending tasks to avoid leaks. RunUntilIdle(); queue_.reset(); } // GestureEventQueueClient - virtual void SendGestureEventImmediately( - const GestureEventWithLatencyInfo& event) OVERRIDE { + void SendGestureEventImmediately( + const GestureEventWithLatencyInfo& event) override { ++sent_gesture_event_count_; if (sync_ack_result_) { scoped_ptr<InputEventAckState> ack_result = sync_ack_result_.Pass(); @@ -54,19 +54,19 @@ class GestureEventQueueTest : public testing::Test, } } - virtual void OnGestureEventAck( - const GestureEventWithLatencyInfo& event, - InputEventAckState ack_result) OVERRIDE { + void OnGestureEventAck(const GestureEventWithLatencyInfo& event, + InputEventAckState ack_result) override { ++acked_gesture_event_count_; last_acked_event_ = event.event; - if (sync_followup_event_) - SimulateGestureEvent(*sync_followup_event_.Pass()); + if (sync_followup_event_) { + auto sync_followup_event = sync_followup_event_.Pass(); + SimulateGestureEvent(*sync_followup_event); + } } // TouchpadTapSuppressionControllerClient - virtual void SendMouseEventImmediately( - const MouseEventWithLatencyInfo& event) OVERRIDE { - } + void SendMouseEventImmediately( + const MouseEventWithLatencyInfo& event) override {} protected: static GestureEventQueue::Config DefaultConfig() { |