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

Side by Side Diff: sync/internal_api/public/engine/passive_model_worker.cc

Issue 637413003: Sync: Avoid deadlock in SyncBackendRegistrar / ModelSafeWorker on sync backend shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor tweaks Created 6 years, 2 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
« no previous file with comments | « sync/internal_api/public/engine/model_safe_worker.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "sync/internal_api/public/engine/passive_model_worker.h" 5 #include "sync/internal_api/public/engine/passive_model_worker.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 8
9 namespace syncer { 9 namespace syncer {
10 10
11 PassiveModelWorker::PassiveModelWorker(const base::MessageLoop* sync_loop, 11 PassiveModelWorker::PassiveModelWorker(const base::MessageLoop* sync_loop,
12 WorkerLoopDestructionObserver* observer) 12 WorkerLoopDestructionObserver* observer)
13 : ModelSafeWorker(observer), 13 : ModelSafeWorker(observer),
14 sync_loop_(sync_loop) { 14 sync_loop_(sync_loop) {
15 } 15 }
16 16
17 PassiveModelWorker::~PassiveModelWorker() { 17 PassiveModelWorker::~PassiveModelWorker() {
18 } 18 }
19 19
20 void PassiveModelWorker::RegisterForLoopDestruction() { 20 void PassiveModelWorker::RegisterForLoopDestruction() {
21 base::MessageLoop::current()->AddDestructionObserver(this);
22 SetWorkingLoopToCurrent(); 21 SetWorkingLoopToCurrent();
23 } 22 }
24 23
25 SyncerError PassiveModelWorker::DoWorkAndWaitUntilDoneImpl( 24 SyncerError PassiveModelWorker::DoWorkAndWaitUntilDoneImpl(
26 const WorkCallback& work) { 25 const WorkCallback& work) {
27 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); 26 DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
28 // Simply do the work on the current thread. 27 // Simply do the work on the current thread.
29 return work.Run(); 28 return work.Run();
30 } 29 }
31 30
32 ModelSafeGroup PassiveModelWorker::GetModelSafeGroup() { 31 ModelSafeGroup PassiveModelWorker::GetModelSafeGroup() {
33 return GROUP_PASSIVE; 32 return GROUP_PASSIVE;
34 } 33 }
35 34
36 } // namespace syncer 35 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/public/engine/model_safe_worker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698