Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 204133004: [SyncFS] Make SyncEngineInitializer run as a background task (3/3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index 3c484d6f9d7b3440b4c6360297085642ca2ad380..8e2b25d83a0f384c97a9944f2d08868764a0304a 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -94,16 +94,29 @@ class ConflictResolverTest : public testing::Test {
}
void InitializeMetadataDatabase() {
- SyncEngineInitializer initializer(context_.get(),
- base::MessageLoopProxy::current(),
- context_->GetDriveService(),
- database_dir_.path(),
- in_memory_env_.get());
+ SyncEngineInitializer* initializer =
+ new SyncEngineInitializer(context_.get(),
+ base::MessageLoopProxy::current(),
+ context_->GetDriveService(),
+ database_dir_.path(),
+ in_memory_env_.get());
SyncStatusCode status = SYNC_STATUS_UNKNOWN;
- initializer.RunSequential(CreateResultReceiver(&status));
+ sync_task_manager_->ScheduleSyncTask(
+ FROM_HERE,
+ scoped_ptr<SyncTask>(initializer),
+ SyncTaskManager::PRIORITY_MED,
+ base::Bind(&ConflictResolverTest::DidInitializeMetadataDatabase,
+ base::Unretained(this), initializer, &status));
+
base::RunLoop().RunUntilIdle();
EXPECT_EQ(SYNC_STATUS_OK, status);
- context_->SetMetadataDatabase(initializer.PassMetadataDatabase());
+ }
+
+ void DidInitializeMetadataDatabase(SyncEngineInitializer* initializer,
+ SyncStatusCode* status_out,
+ SyncStatusCode status) {
+ context_->SetMetadataDatabase(initializer->PassMetadataDatabase());
+ *status_out = status;
}
void RegisterApp(const std::string& app_id,
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698