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

components/sync/engine/browser_thread_model_worker_unittest.cc

Index: components/sync/engine/browser_thread_model_worker_unittest.cc
diff --git a/components/sync/engine/browser_thread_model_worker_unittest.cc b/components/sync/engine/browser_thread_model_worker_unittest.cc
index 98900e63521dc71421e8a6f279763c8f144af104..f4417e9b74eed91e37e636e9cfa0cb1c00e74df1 100644
--- a/components/sync/engine/browser_thread_model_worker_unittest.cc
+++ b/components/sync/engine/browser_thread_model_worker_unittest.cc
@@ -39,10 +39,11 @@
   // DoWork hasn't executed within action_timeout().
   void ScheduleWork() {
     // We wait until the callback is done. So it is safe to use unretained.
+    WorkCallback c = base::Bind(&SyncBrowserThreadModelWorkerTest::DoWork,
+                                base::Unretained(this));
     timer()->Start(FROM_HERE, TestTimeouts::action_timeout(), this,
                    &SyncBrowserThreadModelWorkerTest::Timeout);
-    worker()->DoWorkAndWaitUntilDone(base::BindOnce(
-        &SyncBrowserThreadModelWorkerTest::DoWork, base::Unretained(this)));
+    worker()->DoWorkAndWaitUntilDone(c);
   }
 
   // This is the work that will be scheduled to be done on the DB thread.