replace OVERRIDE and FINAL with override and final in athena/

athena/resource_manager/resource_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/activity/public/activity.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/resource_manager/memory_pressure_notifier.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/test/base/athena_test_base.h"
@@ skipping 17 matching lines @@
         media_state_(ACTIVITY_MEDIA_STATE_NONE),
         is_visible_(false) {}
   virtual ~TestActivity() {}
 
   void set_media_state(ActivityMediaState media_state) {
     media_state_ = media_state;
   }
   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.
   ActivityMediaState media_state_;
 
   // Returns if it is visible or not.
   bool is_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivity);
 };
 
 }  // namespace
 
 // Our testing base.
 class ResourceManagerTest : public AthenaTestBase {
  public:
   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();
   }
 
   TestActivity* CreateActivity(const std::string& title) {
     TestActivity* activity = new TestActivity(title);
     ActivityManager::Get()->AddActivity(activity);
     activity->SetCurrentState(Activity::ACTIVITY_INVISIBLE);
     activity_list_.push_back(activity);
@@ skipping 278 matching lines @@
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       ResourceManager::MEMORY_PRESSURE_CRITICAL);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_INVISIBLE, app2->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, app3->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, app4->GetCurrentState());
 }
 
 }  // namespace test
 }  // namespace athena