| Index: ui/app_list/app_list_model_unittest.cc
|
| diff --git a/ui/app_list/app_list_model_unittest.cc b/ui/app_list/app_list_model_unittest.cc
|
| index c113ecafd6dc591d620a6d7f9572b854b5eb416b..fde8f74cb67e1777f794cc365af6c0c31e9dee9d 100644
|
| --- a/ui/app_list/app_list_model_unittest.cc
|
| +++ b/ui/app_list/app_list_model_unittest.cc
|
| @@ -68,15 +68,11 @@ class TestObserver : public AppListModelObserver {
|
| class AppListModelTest : public testing::Test {
|
| public:
|
| AppListModelTest() {}
|
| - virtual ~AppListModelTest() {}
|
| + ~AppListModelTest() override {}
|
|
|
| // testing::Test overrides:
|
| - virtual void SetUp() override {
|
| - model_.AddObserver(&observer_);
|
| - }
|
| - virtual void TearDown() override {
|
| - model_.RemoveObserver(&observer_);
|
| - }
|
| + void SetUp() override { model_.AddObserver(&observer_); }
|
| + void TearDown() override { model_.RemoveObserver(&observer_); }
|
|
|
| protected:
|
| bool ItemObservedByFolder(AppListFolderItem* folder,
|
| @@ -227,15 +223,11 @@ class AppListModelFolderTest : public AppListModelTest {
|
| AppListModelFolderTest() {
|
| model_.SetFoldersEnabled(true);
|
| }
|
| - virtual ~AppListModelFolderTest() {}
|
| + ~AppListModelFolderTest() override {}
|
|
|
| // testing::Test overrides:
|
| - virtual void SetUp() override {
|
| - AppListModelTest::SetUp();
|
| - }
|
| - virtual void TearDown() override {
|
| - AppListModelTest::TearDown();
|
| - }
|
| + void SetUp() override { AppListModelTest::SetUp(); }
|
| + void TearDown() override { AppListModelTest::TearDown(); }
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(AppListModelFolderTest);
|
|
|