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

Unified Diff: sync/engine/sync_scheduler_impl.cc

Issue 26594002: Chrome sync: Put WeakPtrFactory members at the end (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge (see prior patch for try jobs) Created 7 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 side-by-side diff with in-line comments
Download patch
Index: sync/engine/sync_scheduler_impl.cc
diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc
index d8f754c45424e49e77d0de90489f392c565a1f4a..3cb5619a93411bef449e6190e806b80daa4ee24a 100644
--- a/sync/engine/sync_scheduler_impl.cc
+++ b/sync/engine/sync_scheduler_impl.cc
@@ -152,11 +152,7 @@ SyncSchedulerImpl::SyncSchedulerImpl(const std::string& name,
BackoffDelayProvider* delay_provider,
sessions::SyncSessionContext* context,
Syncer* syncer)
- : weak_ptr_factory_(this),
- weak_ptr_factory_for_weak_handle_(this),
- weak_handle_this_(MakeWeakHandle(
- weak_ptr_factory_for_weak_handle_.GetWeakPtr())),
- name_(name),
+ : name_(name),
started_(false),
syncer_short_poll_interval_seconds_(
TimeDelta::FromSeconds(kDefaultShortPollIntervalSeconds)),
@@ -169,7 +165,11 @@ SyncSchedulerImpl::SyncSchedulerImpl(const std::string& name,
syncer_(syncer),
session_context_(context),
no_scheduling_allowed_(false),
- do_poll_after_credentials_updated_(false) {
+ do_poll_after_credentials_updated_(false),
+ weak_ptr_factory_(this),
+ weak_ptr_factory_for_weak_handle_(this) {
+ weak_handle_this_ = MakeWeakHandle(
+ weak_ptr_factory_for_weak_handle_.GetWeakPtr());
}
SyncSchedulerImpl::~SyncSchedulerImpl() {

Powered by Google App Engine
This is Rietveld 408576698