| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sync/test/engine/fake_model_worker.h" | 5 #include "sync/test/engine/fake_model_worker.h" |
| 6 | 6 |
| 7 namespace syncer { | 7 namespace syncer { |
| 8 | 8 |
| 9 FakeModelWorker::FakeModelWorker(ModelSafeGroup group) : group_(group) {} | 9 FakeModelWorker::FakeModelWorker(ModelSafeGroup group) |
| 10 : ModelSafeWorker(NULL), |
| 11 group_(group) {} |
| 10 | 12 |
| 11 FakeModelWorker::~FakeModelWorker() { | 13 FakeModelWorker::~FakeModelWorker() { |
| 12 // We may need to relax this is FakeModelWorker is used in a | 14 // We may need to relax this is FakeModelWorker is used in a |
| 13 // multi-threaded test; since ModelSafeWorkers are | 15 // multi-threaded test; since ModelSafeWorkers are |
| 14 // RefCountedThreadSafe, they could theoretically be destroyed from | 16 // RefCountedThreadSafe, they could theoretically be destroyed from |
| 15 // a different thread. | 17 // a different thread. |
| 16 DCHECK(CalledOnValidThread()); | 18 DCHECK(CalledOnValidThread()); |
| 17 } | 19 } |
| 18 | 20 |
| 21 void FakeModelWorker::RegisterForLoopDestruction() { |
| 22 NOTREACHED(); |
| 23 } |
| 24 |
| 19 SyncerError FakeModelWorker::DoWorkAndWaitUntilDone( | 25 SyncerError FakeModelWorker::DoWorkAndWaitUntilDone( |
| 20 const WorkCallback& work) { | 26 const WorkCallback& work, base::WaitableEvent* done) { |
| 21 DCHECK(CalledOnValidThread()); | 27 DCHECK(CalledOnValidThread()); |
| 22 // Simply do the work on the current thread. | 28 // Simply do the work on the current thread. |
| 23 return work.Run(); | 29 return work.Run(); |
| 24 } | 30 } |
| 25 | 31 |
| 26 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() { | 32 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() { |
| 27 DCHECK(CalledOnValidThread()); | 33 DCHECK(CalledOnValidThread()); |
| 28 return group_; | 34 return group_; |
| 29 } | 35 } |
| 30 | 36 |
| 31 } // namespace syncer | 37 } // namespace syncer |
| OLD | NEW |