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

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: rebase 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
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 ef5dd95975dba211ddaad2e5ea62dec610acebed..913c5b17bb87cd40f82808198f77e2b69ea23d40 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
@@ -91,16 +91,29 @@ class ConflictResolverTest : public testing::Test,
}
void InitializeMetadataDatabase() {
- SyncEngineInitializer initializer(this,
- base::MessageLoopProxy::current(),
- fake_drive_service_.get(),
- database_dir_.path(),
- in_memory_env_.get());
+ SyncEngineInitializer* initializer =
+ new SyncEngineInitializer(this,
+ base::MessageLoopProxy::current(),
+ fake_drive_service_.get(),
+ 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);
- metadata_database_ = initializer.PassMetadataDatabase();
+ }
+
+ void DidInitializeMetadataDatabase(SyncEngineInitializer* initializer,
+ SyncStatusCode* status_out,
+ SyncStatusCode status) {
+ metadata_database_ = initializer->PassMetadataDatabase();
+ *status_out = status;
}
void RegisterApp(const std::string& app_id,

Powered by Google App Engine
This is Rietveld 408576698