[SyncFS] Refine callback helpers

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
index b80df21f693b228307673b7ab46c63f259a45d34..c5aa587d078f90ca941af1a773fc7d2d13a0da88 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -220,7 +220,9 @@ void SyncEngine::RegisterOrigin(
       FROM_HERE,
       base::Bind(&SyncWorker::RegisterOrigin,
                  base::Unretained(sync_worker_.get()),
-                 origin, CreateRelayedCallback(callback)));
+                 origin,
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 void SyncEngine::EnableOrigin(
@@ -229,7 +231,9 @@ void SyncEngine::EnableOrigin(
       FROM_HERE,
       base::Bind(&SyncWorker::EnableOrigin,
                  base::Unretained(sync_worker_.get()),
-                 origin, CreateRelayedCallback(callback)));
+                 origin,
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 void SyncEngine::DisableOrigin(
@@ -238,7 +242,9 @@ void SyncEngine::DisableOrigin(
       FROM_HERE,
       base::Bind(&SyncWorker::DisableOrigin,
                  base::Unretained(sync_worker_.get()),
-                 origin, CreateRelayedCallback(callback)));
+                 origin,
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 void SyncEngine::UninstallOrigin(
@@ -249,7 +255,9 @@ void SyncEngine::UninstallOrigin(
       FROM_HERE,
       base::Bind(&SyncWorker::UninstallOrigin,
                  base::Unretained(sync_worker_.get()),
-                 origin, flag, CreateRelayedCallback(callback)));
+                 origin, flag,
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 void SyncEngine::ProcessRemoteChange(const SyncFileCallback& callback) {
@@ -257,7 +265,8 @@ void SyncEngine::ProcessRemoteChange(const SyncFileCallback& callback) {
       FROM_HERE,
       base::Bind(&SyncWorker::ProcessRemoteChange,
                  base::Unretained(sync_worker_.get()),
-                 CreateRelayedCallback(callback)));
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) {
@@ -377,7 +386,8 @@ void SyncEngine::ApplyLocalChange(
                  local_path,
                  local_metadata,
                  url,
-                 CreateRelayedCallback(callback)));
+                 RelayCallbackToCurrentThread(
+                     FROM_HERE, callback)));
 }
 
 SyncTaskManager* SyncEngine::GetSyncTaskManagerForTesting() {