replace OVERRIDE and FINAL with override and final in athena/

athena/home/athena_start_page_view_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/athena_start_page_view.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/test/base/athena_test_base.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 15 matching lines @@
 
 }
 
 class AthenaTestViewDelegate : public app_list::test::AppListTestViewDelegate {
  public:
   AthenaTestViewDelegate() {}
   virtual ~AthenaTestViewDelegate() {}
 
  private:
   // app_list::AppListViewDelegate:
-  virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE {
+  virtual views::View* CreateStartPageWebView(const gfx::Size& size) override {
     return new views::View();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaTestViewDelegate);
 };
 
 class AthenaStartPageViewTest : public test::AthenaTestBase {
  public:
   AthenaStartPageViewTest() {}
   virtual ~AthenaStartPageViewTest() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AthenaTestBase::SetUp();
     app_list::test::AppListTestModel* model = view_delegate_.GetTestModel();
     for (size_t i = 0; i < kNumApps; ++i) {
       model->AddItem(new app_list::test::AppListTestModel::AppListTestItem(
           base::StringPrintf("id-%" PRIuS, i), model));
     }
 
     view_.reset(new AthenaStartPageView(&view_delegate_));
     SetSize(gfx::Size(1280, 800));
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     view_.reset();
     test::AthenaTestBase::TearDown();
   }
 
  protected:
   void SetSize(const gfx::Size& new_size) {
     view_->SetSize(new_size);
     view_->Layout();
   }
 
@@ skipping 149 matching lines @@
   EXPECT_GT(base_search_box_bounds.y(), GetSearchBoxBounds().y());
   EXPECT_EQ(query, GetVisibleQuery());
 
   SetSearchQuery(base::string16());
   EXPECT_TRUE(IsLogoVisible());
   EXPECT_EQ(base_search_box_bounds.ToString(), GetSearchBoxBounds().ToString());
   EXPECT_TRUE(GetVisibleQuery().empty());
 }
 
 }  // namespace athena