replace OVERRIDE and FINAL with override and final in ui/

ui/views/widget/native_widget_aura_unittest.cc

Index: ui/views/widget/native_widget_aura_unittest.cc
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index be0041d92831ae7703b0542c3948aa88bbb189a9..6ca6f34f3bc136d357b973c14ea6ff0a64e42b9d 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -40,7 +40,7 @@ class NativeWidgetAuraTest : public aura::test::AuraTestBase {
   virtual ~NativeWidgetAuraTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
     host()->SetBounds(gfx::Rect(640, 480));
@@ -106,14 +106,14 @@ class TestLayoutManagerBase : public aura::LayoutManager {
   virtual ~TestLayoutManagerBase() {}
 
   // aura::LayoutManager:
-  virtual void OnWindowResized() OVERRIDE {}
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {}
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
+  virtual void OnWindowResized() override {}
+  virtual void OnWindowAddedToLayout(aura::Window* child) override {}
+  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
+  virtual void OnWindowRemovedFromLayout(aura::Window* child) override {}
   virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE {}
+                                              bool visible) override {}
   virtual void SetChildBounds(aura::Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE {}
+                              const gfx::Rect& requested_bounds) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestLayoutManagerBase);
@@ -127,7 +127,7 @@ class MaximizeLayoutManager : public TestLayoutManagerBase {
 
  private:
   // aura::LayoutManager:
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWindowAddedToLayout(aura::Window* child) override {
     // This simulates what happens when adding a maximized window.
     SetChildBoundsDirect(child, gfx::Rect(0, 0, 300, 300));
   }
@@ -148,7 +148,7 @@ class TestWidget : public views::Widget {
     return did_size_change_more_than_once_;
   }
 
-  virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE {
+  virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override {
     if (last_size_.IsEmpty())
       last_size_ = new_size;
     else if (!did_size_change_more_than_once_ && new_size != last_size_)
@@ -191,7 +191,7 @@ class PropertyTestLayoutManager : public TestLayoutManagerBase {
 
  private:
   // aura::LayoutManager:
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWindowAddedToLayout(aura::Window* child) override {
     EXPECT_TRUE(child->GetProperty(aura::client::kCanMaximizeKey));
     EXPECT_TRUE(child->GetProperty(aura::client::kCanMinimizeKey));
     EXPECT_TRUE(child->GetProperty(aura::client::kCanResizeKey));
@@ -210,22 +210,22 @@ class PropertyTestWidgetDelegate : public views::WidgetDelegate {
 
  private:
   // views::WidgetDelegate:
-  virtual bool CanMaximize() const OVERRIDE {
+  virtual bool CanMaximize() const override {
     return true;
   }
-  virtual bool CanMinimize() const OVERRIDE {
+  virtual bool CanMinimize() const override {
     return true;
   }
-  virtual bool CanResize() const OVERRIDE {
+  virtual bool CanResize() const override {
     return true;
   }
-  virtual void DeleteDelegate() OVERRIDE {
+  virtual void DeleteDelegate() override {
     delete this;
   }
-  virtual Widget* GetWidget() OVERRIDE {
+  virtual Widget* GetWidget() override {
     return widget_;
   }
-  virtual const Widget* GetWidget() const OVERRIDE {
+  virtual const Widget* GetWidget() const override {
     return widget_;
   }
 
@@ -286,7 +286,7 @@ class GestureTrackingView : public views::View {
   }
 
   // View overrides:
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+  virtual void OnGestureEvent(ui::GestureEvent* event) override {
     got_gesture_event_ = true;
     if (consume_gesture_event_)
       event->StopPropagation();
@@ -454,7 +454,7 @@ class MoveTestWidgetDelegate : public WidgetDelegateView {
   bool got_move() const { return got_move_; }
 
   // WidgetDelegate overrides:
-  virtual void OnWidgetMove() OVERRIDE { got_move_ = true; }
+  virtual void OnWidgetMove() override { got_move_ = true; }
 
  private:
   bool got_move_;