replace OVERRIDE and FINAL with override and final in athena/

athena/resource_manager/resource_manager_unittest.cc

Index: athena/resource_manager/resource_manager_unittest.cc
diff --git a/athena/resource_manager/resource_manager_unittest.cc b/athena/resource_manager/resource_manager_unittest.cc
index 526259351b87d02b641109359db7bf8ded854fc7..ecc55323d930f652ec5dcf94968bd29dcc0ab9ea 100644
--- a/athena/resource_manager/resource_manager_unittest.cc
+++ b/athena/resource_manager/resource_manager_unittest.cc
@@ -35,8 +35,8 @@ class TestActivity : public SampleActivity {
   void set_visible(bool visible) { is_visible_ = visible; }
 
   // Activity overrides:
-  virtual bool IsVisible() OVERRIDE { return is_visible_; }
-  virtual ActivityMediaState GetMediaState() OVERRIDE { return media_state_; }
+  virtual bool IsVisible() override { return is_visible_; }
+  virtual ActivityMediaState GetMediaState() override { return media_state_; }
 
  private:
   // The current media state.
@@ -56,12 +56,12 @@ class ResourceManagerTest : public AthenaTestBase {
   ResourceManagerTest() {}
   virtual ~ResourceManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AthenaTestBase::SetUp();
     // Override the delay to be instantaneous.
     ResourceManager::Get()->SetWaitTimeBetweenResourceManageCalls(0);
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     while (!activity_list_.empty())
       DeleteActivity(activity_list_[0]);
     AthenaTestBase::TearDown();