Revert of [Sync] Refactor ModelSafeWorker::DoWorkAndWaitUntilDone() to avoid code duplication.

components/sync/test/engine/fake_model_worker.cc

Index: components/sync/test/engine/fake_model_worker.cc
diff --git a/components/sync/test/engine/fake_model_worker.cc b/components/sync/test/engine/fake_model_worker.cc
index 966e0a4f5a1d3b298d6fc867aef6bf012f4ccd10..c696005097602c6f52fb85739328138701729aca 100644
--- a/components/sync/test/engine/fake_model_worker.cc
+++ b/components/sync/test/engine/fake_model_worker.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync/test/engine/fake_model_worker.h"
 
-#include <utility>
+#include "base/callback.h"
 
 namespace syncer {
 
@@ -18,10 +18,11 @@
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void FakeModelWorker::ScheduleWork(base::OnceClosure work) {
+SyncerError FakeModelWorker::DoWorkAndWaitUntilDoneImpl(
+    const WorkCallback& work) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Simply do the work on the current thread.
-  std::move(work).Run();
+  return work.Run();
 }
 
 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() {