replace OVERRIDE and FINAL with override and final in ui/

ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.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/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/Xlib.h>
 
 // Get rid of X11 macros which conflict with gtest.
 #undef Bool
@@ skipping 26 matching lines @@
   explicit ActivationWaiter(XID window)
       : X11PropertyChangeWaiter(ui::GetX11RootWindow(), "_NET_ACTIVE_WINDOW"),
         window_(window) {
   }
 
   virtual ~ActivationWaiter() {
   }
 
  private:
   // X11PropertyChangeWaiter:
-  virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE {
+  virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
     XID xid = 0;
     ui::GetXIDProperty(ui::GetX11RootWindow(), "_NET_ACTIVE_WINDOW", &xid);
     return xid != window_;
   }
 
   XID window_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivationWaiter);
 };
 
 // An event handler which counts the number of mouse moves it has seen.
 class MouseMoveCounterHandler : public ui::EventHandler {
  public:
   MouseMoveCounterHandler() : count_(0) {
   }
   virtual ~MouseMoveCounterHandler() {
   }
 
   // ui::EventHandler:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (event->type() == ui::ET_MOUSE_MOVED)
       ++count_;
   }
 
   int num_mouse_moves() const {
     return count_;
   }
 
  private:
   int count_;
@@ skipping 50 matching lines @@
 
   static void SetUpTestCase() {
     gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
     base::FilePath ui_test_pak_path;
     ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
     ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
   }
 
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ViewsTestBase::SetUp();
 
     // Make X11 synchronous for our display connection. This does not force the
     // window manager to behave synchronously.
     XSynchronize(gfx::GetXDisplay(), True);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     XSynchronize(gfx::GetXDisplay(), False);
     ViewsTestBase::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11Test);
 };
 
 // Test that calling Widget::Deactivate() sets the widget as inactive wrt to
 // Chrome even if it not possible to deactivate the window wrt to the x server.
@@ skipping 91 matching lines @@
   EXPECT_EQ(3, recorder2.num_mouse_moves());
   EXPECT_EQ(point_in_screen.ToString(),
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Cleanup
   window1->RemovePreTargetHandler(&recorder1);
   window2->RemovePreTargetHandler(&recorder2);
 }
 
 }  // namespace views