Chromium roll (https://codereview.chromium.org/976353002)

ui/events/gestures/gesture_provider_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_provider_impl.h"
 
 namespace ui {
 
 class GestureProviderImplTest : public testing::Test,
                                 public GestureProviderImplClient {
  public:
   GestureProviderImplTest() {}
 
-  virtual ~GestureProviderImplTest() {}
+  ~GestureProviderImplTest() override {}
 
-  virtual void OnGestureEvent(GestureEvent* event) override {}
+  void OnGestureEvent(GestureEvent* event) override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     provider_.reset(new GestureProviderImpl(this));
   }
 
-  virtual void TearDown() override { provider_.reset(); }
+  void TearDown() override { provider_.reset(); }
 
   GestureProviderImpl* provider() { return provider_.get(); }
 
  private:
   scoped_ptr<GestureProviderImpl> provider_;
   base::MessageLoopForUI message_loop_;
 };
 
 TEST_F(GestureProviderImplTest, IgnoresExtraPressEvents) {
   base::TimeDelta time = ui::EventTimeForNow();
@@ skipping 64 matching lines @@
                      kRadiusX, kRadiusY, kAngle, kForce);
   // Position has changed, so don't ignore the move.
   EXPECT_TRUE(provider()->OnTouchEvent(move0_3));
 
   time += base::TimeDelta::FromMilliseconds(10);
   TouchEvent move0_4(ET_TOUCH_MOVED, gfx::PointF(70, 75.1f), 0, kTouchId0, time,
                      kRadiusX, kRadiusY + 1, kAngle, kForce);
 }
 
 }  // namespace ui