Commit facf66e0 authored by tzik's avatar tzik Committed by Commit bot

[SyncFS] Drop TaskRunner in MetadataDatabase

Drop TaskRunner in MetadataDatabase, that is no longer needed.

BUG=412367

Review URL: https://codereview.chromium.org/556803002

Cr-Commit-Position: refs/heads/master@{#293937}
parent 1467c724
...@@ -133,7 +133,6 @@ class MetadataDatabase { ...@@ -133,7 +133,6 @@ class MetadataDatabase {
// of leveldb::Env::Default(). Use leveldb::MemEnv in test code for faster // of leveldb::Env::Default(). Use leveldb::MemEnv in test code for faster
// testing. // testing.
static void Create( static void Create(
const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
const base::FilePath& database_path, const base::FilePath& database_path,
leveldb::Env* env_override, leveldb::Env* env_override,
const CreateCallback& callback); const CreateCallback& callback);
...@@ -356,7 +355,6 @@ class MetadataDatabase { ...@@ -356,7 +355,6 @@ class MetadataDatabase {
struct CreateParam; struct CreateParam;
MetadataDatabase( MetadataDatabase(
const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
const base::FilePath& database_path, const base::FilePath& database_path,
bool enable_on_disk_index, bool enable_on_disk_index,
leveldb::Env* env_override); leveldb::Env* env_override);
...@@ -411,10 +409,8 @@ class MetadataDatabase { ...@@ -411,10 +409,8 @@ class MetadataDatabase {
const std::string& title, const std::string& title,
const std::string& file_id); const std::string& file_id);
void DetachFromSequence();
bool CanClearDirty(const FileTracker& tracker); bool CanClearDirty(const FileTracker& tracker);
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
base::FilePath database_path_; base::FilePath database_path_;
leveldb::Env* env_override_; leveldb::Env* env_override_;
scoped_ptr<LevelDBWrapper> db_; scoped_ptr<LevelDBWrapper> db_;
...@@ -427,8 +423,6 @@ class MetadataDatabase { ...@@ -427,8 +423,6 @@ class MetadataDatabase {
base::WeakPtrFactory<MetadataDatabase> weak_ptr_factory_; base::WeakPtrFactory<MetadataDatabase> weak_ptr_factory_;
base::SequenceChecker worker_sequence_checker_;
DISALLOW_COPY_AND_ASSIGN(MetadataDatabase); DISALLOW_COPY_AND_ASSIGN(MetadataDatabase);
}; };
......
...@@ -202,8 +202,7 @@ class MetadataDatabaseTest : public testing::Test { ...@@ -202,8 +202,7 @@ class MetadataDatabaseTest : public testing::Test {
SyncStatusCode InitializeMetadataDatabase() { SyncStatusCode InitializeMetadataDatabase() {
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
MetadataDatabase::Create(base::ThreadTaskRunnerHandle::Get(), MetadataDatabase::Create(database_dir_.path(),
database_dir_.path(),
in_memory_env_.get(), in_memory_env_.get(),
CreateResultReceiver(&status, CreateResultReceiver(&status,
&metadata_database_)); &metadata_database_));
......
...@@ -86,7 +86,6 @@ void SyncEngineInitializer::RunPreflight(scoped_ptr<SyncTaskToken> token) { ...@@ -86,7 +86,6 @@ void SyncEngineInitializer::RunPreflight(scoped_ptr<SyncTaskToken> token) {
} }
MetadataDatabase::Create( MetadataDatabase::Create(
sync_context_->GetWorkerTaskRunner(),
database_path_, database_path_,
env_override_, env_override_,
base::Bind(&SyncEngineInitializer::DidCreateMetadataDatabase, base::Bind(&SyncEngineInitializer::DidCreateMetadataDatabase,
......
...@@ -109,7 +109,6 @@ class SyncEngineInitializerTest : public testing::Test { ...@@ -109,7 +109,6 @@ class SyncEngineInitializerTest : public testing::Test {
SyncStatusCode status = SYNC_STATUS_UNKNOWN; SyncStatusCode status = SYNC_STATUS_UNKNOWN;
scoped_ptr<MetadataDatabase> database; scoped_ptr<MetadataDatabase> database;
MetadataDatabase::Create( MetadataDatabase::Create(
base::ThreadTaskRunnerHandle::Get(),
database_path(), database_path(),
in_memory_env_.get(), in_memory_env_.get(),
CreateResultReceiver(&status, &database)); CreateResultReceiver(&status, &database));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment