projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
sync_file_system
/
local
/
syncable_file_system_unittest.cc
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
(file)
--- 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) {}
base::ThreadTaskRunnerHandle::Get().get()),
weak_factory_(this) {}
- v
irtual void SetUp()
{
+ v
oid SetUp() override
{
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
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()));
}
file_system_.MaybeInitializeFileSystemContext(sync_context_.get()));
}
- v
irtual void TearDown()
{
+ v
oid TearDown() override
{
if (sync_context_.get())
sync_context_->ShutdownOnUIThread();
if (sync_context_.get())
sync_context_->ShutdownOnUIThread();
- sync_context_ =
NULL
;
+ sync_context_ =
nullptr
;
file_system_.TearDown();
file_system_.TearDown();