Worker changes to prepare for lock-free shutdown.

sync/test/engine/fake_model_worker.cc

Index: sync/test/engine/fake_model_worker.cc
diff --git a/sync/test/engine/fake_model_worker.cc b/sync/test/engine/fake_model_worker.cc
index dba6fddf8304c9fb563a2094e2d6b19f81dee985..80a58d4e09ba32286557fb44753074d690472f5e 100644
--- a/sync/test/engine/fake_model_worker.cc
+++ b/sync/test/engine/fake_model_worker.cc
@@ -6,7 +6,9 @@
 
 namespace syncer {
 
-FakeModelWorker::FakeModelWorker(ModelSafeGroup group) : group_(group) {}
+FakeModelWorker::FakeModelWorker(ModelSafeGroup group)
+    : ModelSafeWorker(NULL),
+      group_(group) {}
 
 FakeModelWorker::~FakeModelWorker() {
   // We may need to relax this is FakeModelWorker is used in a
@@ -16,7 +18,11 @@ FakeModelWorker::~FakeModelWorker() {
   DCHECK(CalledOnValidThread());
 }
 
-SyncerError FakeModelWorker::DoWorkAndWaitUntilDone(
+void FakeModelWorker::RegisterForLoopDestruction() {
+  NOTREACHED();
+}
+
+SyncerError FakeModelWorker::DoWorkAndWaitUntilDoneImpl(
     const WorkCallback& work) {
   DCHECK(CalledOnValidThread());
   // Simply do the work on the current thread.