replace OVERRIDE and FINAL with override and final in ui/

ui/views/corewm/tooltip_controller_unittest.cc

 // Copyright (c) 2013 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/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
@@ skipping 59 matching lines @@
           widget->GetNativeWindow()->GetRootWindow()));
 }
 
 }  // namespace
 
 class TooltipControllerTest : public aura::test::AuraTestBase {
  public:
   TooltipControllerTest() : view_(NULL) {}
   virtual ~TooltipControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 #if defined(OS_CHROMEOS)
     views_delegate_.reset(new TestViewsDelegate);
 #else
     views_delegate_.reset(new DesktopTestViewsDelegate);
 #endif
 
     aura::test::AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
 #if defined(OS_CHROMEOS)
     controller_.reset(new TooltipController(
           scoped_ptr<views::corewm::Tooltip>(
               new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE))));
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
 #endif
     widget_.reset(CreateWidget(root_window()));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
     helper_.reset(new TooltipControllerTestHelper(
                       GetController(widget_.get())));
     generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
 #if defined(OS_CHROMEOS)
     root_window()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(root_window(), NULL);
     controller_.reset();
 #endif
     generator_.reset();
     helper_.reset();
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
     views_delegate_.reset();
@@ skipping 294 matching lines @@
       static_cast<int>(i - window->parent()->children().begin());
 }
 
 class TestScreenPositionClient : public aura::client::ScreenPositionClient {
  public:
   TestScreenPositionClient() {}
   virtual ~TestScreenPositionClient() {}
 
   // ScreenPositionClient overrides:
   virtual void ConvertPointToScreen(const aura::Window* window,
-                                    gfx::Point* point) OVERRIDE {
+                                    gfx::Point* point) override {
   }
   virtual void ConvertPointFromScreen(const aura::Window* window,
-                                      gfx::Point* point) OVERRIDE {
+                                      gfx::Point* point) override {
   }
   virtual void ConvertHostPointToScreen(aura::Window* root_gwindow,
-                                        gfx::Point* point) OVERRIDE {
+                                        gfx::Point* point) override {
     NOTREACHED();
   }
   virtual void SetBounds(aura::Window* window,
                          const gfx::Rect& bounds,
-                         const gfx::Display& display) OVERRIDE {
+                         const gfx::Display& display) override {
     window->SetBounds(bounds);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestScreenPositionClient);
 };
 
 }  // namespace
 
 class TooltipControllerCaptureTest : public TooltipControllerTest {
  public:
   TooltipControllerCaptureTest() {}
   virtual ~TooltipControllerCaptureTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     TooltipControllerTest::SetUp();
     aura::client::SetScreenPositionClient(GetRootWindow(),
                                           &screen_position_client_);
 #if !defined(OS_CHROMEOS)
     desktop_screen_.reset(CreateDesktopScreen());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    desktop_screen_.get());
 #endif
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
 #if !defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen());
     desktop_screen_.reset();
 #endif
     aura::client::SetScreenPositionClient(GetRootWindow(), NULL);
     TooltipControllerTest::TearDown();
   }
 
  private:
   TestScreenPositionClient screen_position_client_;
@@ skipping 83 matching lines @@
 class TestTooltip : public Tooltip {
  public:
   TestTooltip() : is_visible_(false) {}
   virtual ~TestTooltip() {}
 
   const base::string16& tooltip_text() const { return tooltip_text_; }
 
   // Tooltip:
   virtual void SetText(aura::Window* window,
                        const base::string16& tooltip_text,
-                       const gfx::Point& location) OVERRIDE {
+                       const gfx::Point& location) override {
     tooltip_text_ = tooltip_text;
     location_ = location;
   }
-  virtual void Show() OVERRIDE {
+  virtual void Show() override {
     is_visible_ = true;
   }
-  virtual void Hide() OVERRIDE {
+  virtual void Hide() override {
     is_visible_ = false;
   }
-  virtual bool IsVisible() OVERRIDE {
+  virtual bool IsVisible() override {
     return is_visible_;
   }
   const gfx::Point& location() { return location_; }
 
  private:
   bool is_visible_;
   base::string16 tooltip_text_;
   gfx::Point location_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTooltip);
 };
 
 }  // namespace
 
 // Use for tests that don't depend upon views.
 class TooltipControllerTest2 : public aura::test::AuraTestBase {
  public:
   TooltipControllerTest2() : test_tooltip_(new TestTooltip) {}
   virtual ~TooltipControllerTest2() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
     controller_.reset(new TooltipController(
                           scoped_ptr<corewm::Tooltip>(test_tooltip_)));
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
     generator_.reset(new ui::test::EventGenerator(root_window()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     root_window()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(root_window(), NULL);
     controller_.reset();
     generator_.reset();
     helper_.reset();
     aura::test::AuraTestBase::TearDown();
     wm_state_.reset();
   }
 
  protected:
@@ skipping 42 matching lines @@
   EXPECT_FALSE(helper_->IsTooltipVisible());
   EXPECT_TRUE(helper_->GetTooltipWindow() == NULL);
 }
 
 // Use for tests that need both views and a TestTooltip.
 class TooltipControllerTest3 : public aura::test::AuraTestBase {
  public:
   TooltipControllerTest3() : test_tooltip_(new TestTooltip) {}
   virtual ~TooltipControllerTest3() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
 
     widget_.reset(CreateWidget(root_window()));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
 
     generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
     controller_.reset(new TooltipController(
         scoped_ptr<views::corewm::Tooltip>(test_tooltip_)));
     GetRootWindow()->RemovePreTargetHandler(
         static_cast<TooltipController*>(aura::client::GetTooltipClient(
             widget_->GetNativeWindow()->GetRootWindow())));
     GetRootWindow()->AddPreTargetHandler(controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
     SetTooltipClient(GetRootWindow(), controller_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     GetRootWindow()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(GetRootWindow(), NULL);
 
     controller_.reset();
     generator_.reset();
     helper_.reset();
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
     wm_state_.reset();
   }
@@ skipping 122 matching lines @@
   helper_->FireTooltipTimer();
   tooltip_bounds1 = test_tooltip_->location();
 
   EXPECT_NE(tooltip_bounds1_1, tooltip_bounds1);
   EXPECT_EQ(reference_string, helper_->GetTooltipText());
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views