Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / panels / panel_window_resizer_unittest.cc

diff --git a/src/ash/wm/panels/panel_window_resizer_unittest.cc b/src/ash/wm/panels/panel_window_resizer_unittest.cc
index 2832d68..73500b3 100644 (file)
--- a/src/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/src/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -35,9 +35,9 @@ namespace ash {
 class PanelWindowResizerTest : public test::AshTestBase {
  public:
   PanelWindowResizerTest() {}
-  virtual ~PanelWindowResizerTest() {}
+  ~PanelWindowResizerTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     AshTestBase::SetUp();
     UpdateDisplay("600x400");
     test::ShellTestApi test_api(Shell::GetInstance());
@@ -45,9 +45,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
     shelf_delegate_ = test::TestShelfDelegate::instance();
   }
 
-  virtual void TearDown() OVERRIDE {
-    AshTestBase::TearDown();
-  }
+  void TearDown() override { AshTestBase::TearDown(); }
 
  protected:
   gfx::Point CalculateDragPoint(const WindowResizer& resizer,
@@ -191,7 +189,7 @@ class PanelWindowResizerTextDirectionTest
   PanelWindowResizerTextDirectionTest() : is_rtl_(GetParam()) {}
   virtual ~PanelWindowResizerTextDirectionTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     original_locale = l10n_util::GetApplicationLocale(std::string());
     if (is_rtl_)
       base::i18n::SetICUDefaultLocale("he");
@@ -199,7 +197,7 @@ class PanelWindowResizerTextDirectionTest
     ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     if (is_rtl_)
       base::i18n::SetICUDefaultLocale(original_locale);
     PanelWindowResizerTest::TearDown();