Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Side by Side Diff: components/sync/test/engine/fake_model_worker.cc

Issue 2782573002: [Sync] Refactor ModelSafeWorker::DoWorkAndWaitUntilDone() to avoid code duplication. (Closed)
Patch Set: fix-test-error Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "components/sync/test/engine/fake_model_worker.h" 5 #include "components/sync/test/engine/fake_model_worker.h"
6 6
7 #include "base/callback.h"
8
9 namespace syncer { 7 namespace syncer {
10 8
11 FakeModelWorker::FakeModelWorker(ModelSafeGroup group) : group_(group) {} 9 FakeModelWorker::FakeModelWorker(ModelSafeGroup group) : group_(group) {}
12 10
13 FakeModelWorker::~FakeModelWorker() { 11 FakeModelWorker::~FakeModelWorker() {
14 // We may need to relax this is FakeModelWorker is used in a 12 // We may need to relax this is FakeModelWorker is used in a
15 // multi-threaded test; since ModelSafeWorkers are 13 // multi-threaded test; since ModelSafeWorkers are
16 // RefCountedThreadSafe, they could theoretically be destroyed from 14 // RefCountedThreadSafe, they could theoretically be destroyed from
17 // a different thread. 15 // a different thread.
18 DCHECK(thread_checker_.CalledOnValidThread()); 16 DCHECK(thread_checker_.CalledOnValidThread());
19 } 17 }
20 18
21 SyncerError FakeModelWorker::DoWorkAndWaitUntilDoneImpl( 19 void FakeModelWorker::ScheduleWork(base::Closure work) {
22 const WorkCallback& work) {
23 DCHECK(thread_checker_.CalledOnValidThread()); 20 DCHECK(thread_checker_.CalledOnValidThread());
24 // Simply do the work on the current thread. 21 // Simply do the work on the current thread.
25 return work.Run(); 22 work.Run();
26 } 23 }
27 24
28 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() { 25 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() {
29 DCHECK(thread_checker_.CalledOnValidThread()); 26 DCHECK(thread_checker_.CalledOnValidThread());
30 return group_; 27 return group_;
31 } 28 }
32 29
33 bool FakeModelWorker::IsOnModelThread() { 30 bool FakeModelWorker::IsOnModelThread() {
34 return thread_checker_.CalledOnValidThread(); 31 return thread_checker_.CalledOnValidThread();
35 } 32 }
36 33
37 } // namespace syncer 34 } // namespace syncer
OLDNEW
« components/sync/engine/ui_model_worker.cc ('K') | « components/sync/test/engine/fake_model_worker.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698