X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fsync_file_system%2Flocal%2Fsyncable_file_system_unittest.cc;h=4e1d7847e89f992df5d5755a1f35faf1657a0903;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=5bf7d685a33e2f1455aba3e5e978788cde768e97;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc index 5bf7d68..4e1d784 100644 --- a/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc +++ b/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc @@ -42,7 +42,7 @@ class SyncableFileSystemTest : public testing::Test { base::ThreadTaskRunnerHandle::Get().get()), weak_factory_(this) {} - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED); @@ -56,10 +56,10 @@ class SyncableFileSystemTest : public testing::Test { file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); } - virtual void TearDown() { + void TearDown() override { if (sync_context_.get()) sync_context_->ShutdownOnUIThread(); - sync_context_ = NULL; + sync_context_ = nullptr; file_system_.TearDown();