| Index: ash/wm/panels/panel_layout_manager_unittest.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
|
| index 1489972c2e733014037e44f8a9827d0c17da8469..f540d4f8c855fe8dc8191b69b911cbbe70f72d79 100644
|
| --- a/ash/wm/panels/panel_layout_manager_unittest.cc
|
| +++ b/ash/wm/panels/panel_layout_manager_unittest.cc
|
| @@ -48,7 +48,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
|
| PanelLayoutManagerTest() {}
|
| virtual ~PanelLayoutManagerTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| test::AshTestBase::SetUp();
|
| ASSERT_TRUE(test::TestShelfDelegate::instance());
|
|
|
| @@ -278,7 +278,7 @@ class PanelLayoutManagerTextDirectionTest
|
| PanelLayoutManagerTextDirectionTest() : is_rtl_(GetParam()) {}
|
| virtual ~PanelLayoutManagerTextDirectionTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| original_locale = l10n_util::GetApplicationLocale(std::string());
|
| if (is_rtl_)
|
| base::i18n::SetICUDefaultLocale("he");
|
| @@ -286,7 +286,7 @@ class PanelLayoutManagerTextDirectionTest
|
| ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (is_rtl_)
|
| base::i18n::SetICUDefaultLocale(original_locale);
|
| PanelLayoutManagerTest::TearDown();
|
|
|