replace OVERRIDE and FINAL with override and final in ui/

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index 75a71acea5cbdfa5f483e09658347dc802676a27..4b18ee712ffcf29b78ac30e674eb3352bff31af1 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -34,7 +34,7 @@ class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
   }
 
   // DesktopNativeWidgetAura:
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
+  virtual int GetNonClientComponent(const gfx::Point& point) const override {
     return window_component_;
   }
 
@@ -58,7 +58,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
   virtual ~DesktopScreenX11Test() {}
 
   // Overridden from testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ViewsTestBase::SetUp();
     // Initialize the world to the single monitor case.
     std::vector<gfx::Display> displays;
@@ -67,7 +67,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
     screen_->AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     screen_.reset();
     ViewsTestBase::TearDown();
   }
@@ -111,16 +111,16 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
 
  private:
   // Overridden from gfx::DisplayObserver:
-  virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE {
+  virtual void OnDisplayAdded(const gfx::Display& new_display) override {
     added_display_.push_back(new_display);
   }
 
-  virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE {
+  virtual void OnDisplayRemoved(const gfx::Display& old_display) override {
     removed_display_.push_back(old_display);
   }
 
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
-                                       uint32_t metrics) OVERRIDE {
+                                       uint32_t metrics) override {
     changed_display_.push_back(display);
   }