| Index: sync/syncable/syncable_unittest.cc
|
| diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
|
| index 5706106034a90727e4f7578d34bd209d38dae423..d1c6ae86d187bc90afeb8003ed108f92c9d756a4 100644
|
| --- a/sync/syncable/syncable_unittest.cc
|
| +++ b/sync/syncable/syncable_unittest.cc
|
| @@ -146,7 +146,7 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
|
| protected:
|
| // SetUp() is called before each test case is run.
|
| // The sqlite3 DB is deleted before each test is run.
|
| - virtual void SetUp() {
|
| + void SetUp() override {
|
| SyncableDirectoryTest::SetUp();
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| file_path_ = temp_dir_.path().Append(
|
| @@ -155,7 +155,7 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
|
| CreateDirectory();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + void TearDown() override {
|
| // This also closes file handles.
|
| dir()->SaveChanges();
|
| dir().reset();
|
| @@ -545,12 +545,10 @@ TEST_F(OnDiskSyncableDirectoryTest, TestSaveChangesFailureWithPurge) {
|
|
|
| class SyncableDirectoryManagement : public testing::Test {
|
| public:
|
| - virtual void SetUp() {
|
| - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| - }
|
| + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
|
| +
|
| + void TearDown() override {}
|
|
|
| - virtual void TearDown() {
|
| - }
|
| protected:
|
| base::MessageLoop message_loop_;
|
| base::ScopedTempDir temp_dir_;
|
|
|