diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:58:14 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:58:14 +0000 |
| commit | 7df2d35dd54de39672acd39ee8e7590479c89b95 (patch) | |
| tree | 11b4127dc3bd3a292d17dd00bafafd043061d90f /sync/engine/sync_scheduler_impl.h | |
| parent | 66bfba6684d26e1eeaed4eacdb5a7e77f11c6725 (diff) | |
| download | chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.zip chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.tar.gz chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.tar.bz2 | |
Revert "Lock-free shutdown of profile sync service. Changes include:"
Introduced shutdown crashes. See bug crbug.com/259974 for discussion.
Original codereview at https://chromiumcodereview.appspot.com/16770005
This also reverts "Disconnect non-frontend processor using the processor in "
due to its depdency on the above patch.
Original codereview at https://chromiumcodereview.appspot.com/5878607637381120
BUG=19757,259974
TBR=haitaol@chromium.org
Review URL: https://codereview.chromium.org/18890004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/sync_scheduler_impl.h')
| -rw-r--r-- | sync/engine/sync_scheduler_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h index 362d754..5d350a4 100644 --- a/sync/engine/sync_scheduler_impl.h +++ b/sync/engine/sync_scheduler_impl.h @@ -55,7 +55,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl virtual void Start(Mode mode) OVERRIDE; virtual bool ScheduleConfiguration( const ConfigurationParams& params) OVERRIDE; - virtual void RequestStop() OVERRIDE; + virtual void RequestStop(const base::Closure& callback) OVERRIDE; virtual void ScheduleLocalNudge( const base::TimeDelta& desired_delay, ModelTypeSet types, @@ -183,7 +183,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl bool CanRunNudgeJobNow(JobPriority priority); // 'Impl' here refers to real implementation of public functions. - void StopImpl(); + void StopImpl(const base::Closure& callback); // If the scheduler's current state supports it, this will create a job based // on the passed in parameters and coalesce it with any other pending jobs, |