replace OVERRIDE and FINAL with override and final in ui/

ui/views/test/x11_property_change_waiter.h

 // 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.
 
 #ifndef UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
@@ skipping 19 matching lines @@
  protected:
   // Returns whether the run loop can exit.
   virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event);
 
   XID xwindow() const {
     return x_window_;
   }
 
  private:
   // ui::PlatformEventDispatcher:
-  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
-  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
 
   XID x_window_;
   const char* property_;
 
   // Whether Wait() should block.
   bool wait_;
 
   // Ends the run loop.
   base::Closure quit_closure_;
 
   // The event mask to be restored upon X11PropertyChangeWaiter's destruction.
   long old_event_mask_;
 
   scoped_ptr<ui::ScopedEventDispatcher> dispatcher_;
 
   scoped_ptr<ui::X11AtomCache> atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_