Index: ui/app_list/views/folder_header_view_unittest.cc |
diff --git a/ui/app_list/views/folder_header_view_unittest.cc b/ui/app_list/views/folder_header_view_unittest.cc |
index 34f1984c6af5674a54f98cec2d203a78d3a735e1..6408adbf4e6a4ac587eb79434c3e3ccb1b3664c9 100644 |
--- a/ui/app_list/views/folder_header_view_unittest.cc |
+++ b/ui/app_list/views/folder_header_view_unittest.cc |
@@ -32,12 +32,12 @@ class TestFolderHeaderViewDelegate : public FolderHeaderViewDelegate { |
// FolderHeaderViewDelegate |
virtual void NavigateBack(AppListFolderItem* item, |
- const ui::Event& event_flags) OVERRIDE {} |
+ const ui::Event& event_flags) override {} |
- virtual void GiveBackFocusToSearchBox() OVERRIDE {} |
+ virtual void GiveBackFocusToSearchBox() override {} |
virtual void SetItemName(AppListFolderItem* item, |
- const std::string& name) OVERRIDE { |
+ const std::string& name) override { |
folder_name_ = name; |
} |
@@ -57,7 +57,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase { |
virtual ~FolderHeaderViewTest() {} |
// testing::Test overrides: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
views::ViewsTestBase::SetUp(); |
model_.reset(new AppListTestModel); |
model_->SetFoldersEnabled(true); |
@@ -66,7 +66,7 @@ class FolderHeaderViewTest : public views::ViewsTestBase { |
folder_header_view_.reset(new FolderHeaderView(delegate_.get())); |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
folder_header_view_.reset(); // Release apps grid view before models. |
delegate_.reset(); |
views::ViewsTestBase::TearDown(); |