replace OVERRIDE and FINAL with override and final in athena/

athena/home/home_card_gesture_manager_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 "athena/home/home_card_gesture_manager.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/home/public/home_card.h"
 #include "athena/test/base/athena_test_base.h"
 #include "base/time/time.h"
@@ skipping 10 matching lines @@
         last_from_state_(HomeCard::HIDDEN),
         last_to_state_(HomeCard::HIDDEN),
         last_progress_(0.0f),
         was_fling_(false),
         last_y_(0),
         progress_count_(0),
         end_count_(0) {}
   virtual ~HomeCardGestureManagerTest() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AthenaTestBase::SetUp();
     gesture_manager_.reset(new HomeCardGestureManager(this, screen_bounds()));
   }
 
  protected:
   int GetEndCountAndReset() {
     int result = end_count_;
     end_count_ = 0;
     return result;
   }
@@ skipping 48 matching lines @@
   float last_progress_;
   bool was_fling_;
 
  private:
   gfx::Rect screen_bounds() const {
     return gfx::Rect(0, 0, 1280, 1024);
   }
 
   // HomeCardGestureManager::Delegate:
   virtual void OnGestureEnded(HomeCard::State final_state,
-                              bool is_fling) OVERRIDE {
+                              bool is_fling) override {
     final_state_ = final_state;
     was_fling_ = is_fling;
     ++end_count_;
   }
 
   virtual void OnGestureProgressed(HomeCard::State from_state,
                                    HomeCard::State to_state,
-                                   float progress) OVERRIDE {
+                                   float progress) override {
     last_from_state_ = from_state;
     last_to_state_ = to_state;
     last_progress_ = progress;
     ++progress_count_;
   }
 
   int last_y_;
   int progress_count_;
   int end_count_;
   scoped_ptr<HomeCardGestureManager> gesture_manager_;
@@ skipping 173 matching lines @@
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE,
                       screen_height() - kHomeCardHeight);
   ProcessFlingGesture(-150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
   EXPECT_TRUE(was_fling_);
 }
 
 }  // namespace athena