Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host

content/browser/renderer_host/input/touch_selection_controller_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 "content/browser/renderer_host/input/touch_selection_controller.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/mock_motion_event.h"
 
 using ui::test::MockMotionEvent;
 
 namespace content {
 namespace {
 
 const int kDefaultTapTimeoutMs = 200;
 const float kDefaulTapSlop = 10.f;
 
 class MockTouchHandleDrawable : public TouchHandleDrawable {
  public:
   explicit MockTouchHandleDrawable(bool* contains_point)
       : intersects_rect_(contains_point) {}
   virtual ~MockTouchHandleDrawable() {}
-  virtual void SetEnabled(bool enabled) OVERRIDE {}
-  virtual void SetOrientation(TouchHandleOrientation orientation) OVERRIDE {}
-  virtual void SetAlpha(float alpha) OVERRIDE {}
-  virtual void SetFocus(const gfx::PointF& position) OVERRIDE {}
-  virtual void SetVisible(bool visible) OVERRIDE {}
-  virtual bool IntersectsWith(const gfx::RectF& rect) const OVERRIDE {
+  virtual void SetEnabled(bool enabled) override {}
+  virtual void SetOrientation(TouchHandleOrientation orientation) override {}
+  virtual void SetAlpha(float alpha) override {}
+  virtual void SetFocus(const gfx::PointF& position) override {}
+  virtual void SetVisible(bool visible) override {}
+  virtual bool IntersectsWith(const gfx::RectF& rect) const override {
     return *intersects_rect_;
   }
 
  private:
   bool* intersects_rect_;
 };
 
 }  // namespace
 
 class TouchSelectionControllerTest : public testing::Test,
                                      public TouchSelectionControllerClient {
  public:
   TouchSelectionControllerTest()
       : last_event_(SELECTION_CLEARED),
         caret_moved_(false),
         selection_moved_(false),
         needs_animate_(false),
         animation_enabled_(true),
         dragging_enabled_(false) {}
 
   virtual ~TouchSelectionControllerTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     controller_.reset(new TouchSelectionController(
         this,
         base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs),
         kDefaulTapSlop));
   }
 
-  virtual void TearDown() OVERRIDE { controller_.reset(); }
+  virtual void TearDown() override { controller_.reset(); }
 
   // TouchSelectionControllerClient implementation.
 
-  virtual bool SupportsAnimation() const OVERRIDE { return animation_enabled_; }
+  virtual bool SupportsAnimation() const override { return animation_enabled_; }
 
-  virtual void SetNeedsAnimate() OVERRIDE { needs_animate_ = true; }
+  virtual void SetNeedsAnimate() override { needs_animate_ = true; }
 
-  virtual void MoveCaret(const gfx::PointF& position) OVERRIDE {
+  virtual void MoveCaret(const gfx::PointF& position) override {
     caret_moved_ = true;
     caret_position_ = position;
   }
 
   virtual void SelectBetweenCoordinates(const gfx::PointF& start,
-                                        const gfx::PointF& end) OVERRIDE {
+                                        const gfx::PointF& end) override {
     selection_moved_ = true;
     selection_start_ = start;
     selection_end_ = end;
   }
 
   virtual void OnSelectionEvent(SelectionEventType event,
-                                const gfx::PointF& end_position) OVERRIDE {
+                                const gfx::PointF& end_position) override {
     last_event_ = event;
     last_event_start_ = end_position;
   }
 
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE {
+  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
   void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
   void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
 
   void ClearSelection() {
     controller_->OnSelectionBoundsChanged(cc::ViewportSelectionBound(),
                                           cc::ViewportSelectionBound());
@@ skipping 574 matching lines @@
   EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnTapEvent();
   ClearSelection();
   EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 }
 
 }  // namespace content