replace OVERRIDE and FINAL with override and final in ui/

ui/app_list/views/app_list_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 "ui/app_list/views/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 126 matching lines @@
 };
 
 // Extend the regular AppListTestViewDelegate to communicate back to the test
 // context. Note the test context doesn't simply inherit this, because the
 // delegate is owned by the view.
 class UnitTestViewDelegate : public app_list::test::AppListTestViewDelegate {
  public:
   UnitTestViewDelegate(AppListViewTestContext* parent) : parent_(parent) {}
 
   // Overridden from app_list::AppListViewDelegate:
-  virtual bool ShouldCenterWindow() const OVERRIDE {
+  virtual bool ShouldCenterWindow() const override {
     return app_list::switches::IsCenteredAppListEnabled();
   }
 
   // Overridden from app_list::test::AppListTestViewDelegate:
-  virtual void ViewClosing() OVERRIDE { parent_->NativeWidgetClosing(); }
+  virtual void ViewClosing() override { parent_->NativeWidgetClosing(); }
 
  private:
   AppListViewTestContext* parent_;
 
   DISALLOW_COPY_AND_ASSIGN(UnitTestViewDelegate);
 };
 
 AppListViewTestContext::AppListViewTestContext(int test_type,
                                                gfx::NativeView parent)
     : test_type_(static_cast<TestType>(test_type)) {
@@ skipping 393 matching lines @@
   Close();
 }
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestAura() {}
   virtual ~AppListViewTestAura() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     views::ViewsTestBase::SetUp();
 
     // On Ash (only) the app list is placed into an aura::Window "container",
     // which is also used to determine the context. In tests, use the ash root
     // window as the parent. This only works on aura where the root window is a
     // NativeView as well as a NativeWindow.
     gfx::NativeView container = NULL;
 #if defined(USE_AURA)
     container = GetContext();
 #endif
 
     test_context_.reset(new AppListViewTestContext(GetParam(), container));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   scoped_ptr<AppListViewTestContext> test_context_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestAura);
 };
 
 class AppListViewTestDesktop : public views::ViewsTestBase,
                                public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestDesktop() {}
   virtual ~AppListViewTestDesktop() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     set_views_delegate(new AppListViewTestViewsDelegate(this));
     views::ViewsTestBase::SetUp();
     test_context_.reset(new AppListViewTestContext(GetParam(), NULL));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   scoped_ptr<AppListViewTestContext> test_context_;
 
  private:
   class AppListViewTestViewsDelegate : public views::TestViewsDelegate {
    public:
     AppListViewTestViewsDelegate(AppListViewTestDesktop* parent)
         : parent_(parent) {}
 
     // Overridden from views::ViewsDelegate:
     virtual void OnBeforeWidgetInit(
         views::Widget::InitParams* params,
-        views::internal::NativeWidgetDelegate* delegate) OVERRIDE;
+        views::internal::NativeWidgetDelegate* delegate) override;
 
    private:
     AppListViewTestDesktop* parent_;
 
     DISALLOW_COPY_AND_ASSIGN(AppListViewTestViewsDelegate);
   };
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestDesktop);
 };
 
@@ skipping 75 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list