replace OVERRIDE and FINAL with override and final in athena/

athena/test/base/test_app_model_builder.h

Index: athena/test/base/test_app_model_builder.h
diff --git a/athena/test/base/test_app_model_builder.h b/athena/test/base/test_app_model_builder.h
index df9dc4ef55adb64d3368161de490d303971eb9aa..262ce254a09d85e771b6417163bc39b5fdc187d9 100644
--- a/athena/test/base/test_app_model_builder.h
+++ b/athena/test/base/test_app_model_builder.h
@@ -16,7 +16,7 @@ class TestAppModelBuilder : public AppModelBuilder {
   virtual ~TestAppModelBuilder();
 
   // Overridden from AppModelBuilder:
-  virtual void PopulateApps(app_list::AppListModel* model) OVERRIDE;
+  virtual void PopulateApps(app_list::AppListModel* model) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAppModelBuilder);