| Index: chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| index a8a9e6dadea47c813d97957094b93f584e2debfa..49690aed87a0ce1a40ec84251b4829ad7d457795 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| @@ -96,18 +96,34 @@ class RemoteToLocalSyncerTest : 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(&RemoteToLocalSyncerTest::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) {
|
| + *status_out = status;
|
| + context_->SetMetadataDatabase(initializer->PassMetadataDatabase());
|
| + }
|
| +
|
| +
|
| void RegisterApp(const std::string& app_id,
|
| const std::string& app_root_folder_id) {
|
| SyncStatusCode status = SYNC_STATUS_FAILED;
|
|
|