diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 06:12:09 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 06:12:09 +0000 |
| commit | 5526750836b701c496554c7d6d2ce1f1ceb677a2 (patch) | |
| tree | 8b1b7cf6735d1975f0625db5006d3615200a71eb | |
| parent | 22d3f911c448571662dcd8c2ac5003185b93c2da (diff) | |
| download | chromium_src-5526750836b701c496554c7d6d2ce1f1ceb677a2.zip chromium_src-5526750836b701c496554c7d6d2ce1f1ceb677a2.tar.gz chromium_src-5526750836b701c496554c7d6d2ce1f1ceb677a2.tar.bz2 | |
sync: rearrange calls to avoid unnecessary CHECKing
BUG=165561
Review URL: https://chromiumcodereview.appspot.com/11929033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177979 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | sync/engine/sync_scheduler_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc index da29ac4..c2a5353 100644 --- a/sync/engine/sync_scheduler_impl.cc +++ b/sync/engine/sync_scheduler_impl.cc @@ -654,8 +654,8 @@ void SyncSchedulerImpl::ScheduleNudgeImpl( // was previously unscheduled and giving it wings, so take care to reset // unscheduled nudge storage. job = pending_nudge_->CloneAndAbandon(); - unscheduled_nudge_storage_.reset(); pending_nudge_ = NULL; + unscheduled_nudge_storage_.reset(); // It's also possible we took a canary job, since we allow one nudge // per backoff interval. DCHECK(!wait_interval_ || !wait_interval_->had_nudge); @@ -1010,8 +1010,8 @@ void SyncSchedulerImpl::StopImpl(const base::Closure& callback) { weak_ptr_factory_.InvalidateWeakPtrs(); wait_interval_.reset(); poll_timer_.Stop(); - unscheduled_nudge_storage_.reset(); pending_nudge_ = NULL; + unscheduled_nudge_storage_.reset(); if (started_) { started_ = false; } |