replace OVERRIDE and FINAL with override and final in ash/

ash/system/tray/system_tray_unittest.cc

 // Copyright (c) 2012 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 "ash/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/root_window_controller.h"
@@ skipping 30 matching lines @@
 SystemTray* GetSystemTray() {
   return Shell::GetPrimaryRootWindowController()->shelf()->
       status_area_widget()->system_tray();
 }
 
 // Trivial item implementation that tracks its views for testing.
 class TestItem : public SystemTrayItem {
  public:
   TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {}
 
-  virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateTrayView(user::LoginStatus status) override {
     tray_view_ = new views::View;
     // Add a label so it has non-zero width.
     tray_view_->SetLayoutManager(new views::FillLayout);
     tray_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Tray")));
     return tray_view_;
   }
 
-  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateDefaultView(user::LoginStatus status) override {
     default_view_ = new views::View;
     default_view_->SetLayoutManager(new views::FillLayout);
     default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default")));
     return default_view_;
   }
 
-  virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateDetailedView(user::LoginStatus status) override {
     detailed_view_ = new views::View;
     detailed_view_->SetLayoutManager(new views::FillLayout);
     detailed_view_->AddChildView(
         new views::Label(base::UTF8ToUTF16("Detailed")));
     return detailed_view_;
   }
 
   virtual views::View* CreateNotificationView(
-      user::LoginStatus status) OVERRIDE {
+      user::LoginStatus status) override {
     notification_view_ = new views::View;
     return notification_view_;
   }
 
-  virtual void DestroyTrayView() OVERRIDE {
+  virtual void DestroyTrayView() override {
     tray_view_ = NULL;
   }
 
-  virtual void DestroyDefaultView() OVERRIDE {
+  virtual void DestroyDefaultView() override {
     default_view_ = NULL;
   }
 
-  virtual void DestroyDetailedView() OVERRIDE {
+  virtual void DestroyDetailedView() override {
     detailed_view_ = NULL;
   }
 
-  virtual void DestroyNotificationView() OVERRIDE {
+  virtual void DestroyNotificationView() override {
     notification_view_ = NULL;
   }
 
   virtual void UpdateAfterLoginStatusChange(
-      user::LoginStatus status) OVERRIDE {
+      user::LoginStatus status) override {
   }
 
   views::View* tray_view() const { return tray_view_; }
   views::View* default_view() const { return default_view_; }
   views::View* detailed_view() const { return detailed_view_; }
   views::View* notification_view() const { return notification_view_; }
 
  private:
   views::View* tray_view_;
   views::View* default_view_;
   views::View* detailed_view_;
   views::View* notification_view_;
 };
 
 // Trivial item implementation that returns NULL from tray/default/detailed
 // view creation methods.
 class TestNoViewItem : public SystemTrayItem {
  public:
   TestNoViewItem() : SystemTrayItem(GetSystemTray()) {}
 
-  virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateTrayView(user::LoginStatus status) override {
     return NULL;
   }
 
-  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateDefaultView(user::LoginStatus status) override {
     return NULL;
   }
 
-  virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE {
+  virtual views::View* CreateDetailedView(user::LoginStatus status) override {
     return NULL;
   }
 
   virtual views::View* CreateNotificationView(
-      user::LoginStatus status) OVERRIDE {
+      user::LoginStatus status) override {
     return NULL;
   }
 
-  virtual void DestroyTrayView() OVERRIDE {}
-  virtual void DestroyDefaultView() OVERRIDE {}
-  virtual void DestroyDetailedView() OVERRIDE {}
-  virtual void DestroyNotificationView() OVERRIDE {}
+  virtual void DestroyTrayView() override {}
+  virtual void DestroyDefaultView() override {}
+  virtual void DestroyDetailedView() override {}
+  virtual void DestroyNotificationView() override {}
   virtual void UpdateAfterLoginStatusChange(
-      user::LoginStatus status) OVERRIDE {
+      user::LoginStatus status) override {
   }
 };
 
 class ModalWidgetDelegate : public views::WidgetDelegateView {
  public:
   ModalWidgetDelegate() {}
   virtual ~ModalWidgetDelegate() {}
 
-  virtual views::View* GetContentsView() OVERRIDE { return this; }
-  virtual ui::ModalType GetModalType() const OVERRIDE {
+  virtual views::View* GetContentsView() override { return this; }
+  virtual ui::ModalType GetModalType() const override {
     return ui::MODAL_TYPE_SYSTEM;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
 }  // namespace
 
 typedef AshTestBase SystemTrayTest;
@@ skipping 339 matching lines @@
 
   tray->SetVisible(true);
   animation_duration.reset();
   tray->layer()->GetAnimator()->StopAnimating();
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
 }
 
 }  // namespace test
 }  // namespace ash