| Index: ui/events/gesture_detection/gesture_provider_unittest.cc
|
| diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc
|
| index da305ff92c01dff31ef1b27e55b1fd02b1fc64a9..bf483ef4f99c85d8e337c15287ebc53765f80441 100644
|
| --- a/ui/events/gesture_detection/gesture_provider_unittest.cc
|
| +++ b/ui/events/gesture_detection/gesture_provider_unittest.cc
|
| @@ -58,7 +58,7 @@ gfx::RectF BoundsForSingleMockTouchAtLocation(float x, float y) {
|
| class GestureProviderTest : public testing::Test, public GestureProviderClient {
|
| public:
|
| GestureProviderTest() {}
|
| - virtual ~GestureProviderTest() {}
|
| + ~GestureProviderTest() override {}
|
|
|
| static MockMotionEvent ObtainMotionEvent(base::TimeTicks event_time,
|
| MotionEvent::Action action,
|
| @@ -123,15 +123,15 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient {
|
| }
|
|
|
| // Test
|
| - virtual void SetUp() override { SetUpWithConfig(GetDefaultConfig()); }
|
| + void SetUp() override { SetUpWithConfig(GetDefaultConfig()); }
|
|
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| gestures_.clear();
|
| gesture_provider_.reset();
|
| }
|
|
|
| // GestureProviderClient
|
| - virtual void OnGestureEvent(const GestureEventData& gesture) override {
|
| + void OnGestureEvent(const GestureEventData& gesture) override {
|
| if (gesture.type() == ET_GESTURE_SCROLL_BEGIN)
|
| active_scroll_begin_event_.reset(new GestureEventData(gesture));
|
| gestures_.push_back(gesture);
|
|
|