| Index: components/sync/engine_impl/sync_scheduler_impl.cc
|
| diff --git a/components/sync/engine_impl/sync_scheduler_impl.cc b/components/sync/engine_impl/sync_scheduler_impl.cc
|
| index 054e917106323bacbd24e25d640627db84e47351..d9d72533754ab6518a7f42bb63b25b7d3a7f23e3 100644
|
| --- a/components/sync/engine_impl/sync_scheduler_impl.cc
|
| +++ b/components/sync/engine_impl/sync_scheduler_impl.cc
|
| @@ -24,11 +24,10 @@
|
|
|
| using base::TimeDelta;
|
| using base::TimeTicks;
|
| +using sync_pb::GetUpdatesCallerInfo;
|
|
|
| namespace syncer {
|
|
|
| -using sync_pb::GetUpdatesCallerInfo;
|
| -
|
| namespace {
|
|
|
| bool IsConfigRelatedUpdateSourceValue(
|
| @@ -119,23 +118,6 @@ ClearParams::ClearParams(const base::Closure& report_success_task)
|
| ClearParams::ClearParams(const ClearParams& other) = default;
|
| ClearParams::~ClearParams() {}
|
|
|
| -GetUpdatesCallerInfo::GetUpdatesSource GetUpdatesFromNudgeSource(
|
| - NudgeSource source) {
|
| - switch (source) {
|
| - case NUDGE_SOURCE_NOTIFICATION:
|
| - return GetUpdatesCallerInfo::NOTIFICATION;
|
| - case NUDGE_SOURCE_LOCAL:
|
| - return GetUpdatesCallerInfo::LOCAL;
|
| - case NUDGE_SOURCE_LOCAL_REFRESH:
|
| - return GetUpdatesCallerInfo::DATATYPE_REFRESH;
|
| - case NUDGE_SOURCE_UNKNOWN:
|
| - return GetUpdatesCallerInfo::UNKNOWN;
|
| - default:
|
| - NOTREACHED();
|
| - return GetUpdatesCallerInfo::UNKNOWN;
|
| - }
|
| -}
|
| -
|
| // Helper macros to log with the syncer thread name; useful when there
|
| // are multiple syncer threads involved.
|
|
|
| @@ -163,11 +145,7 @@ SyncSchedulerImpl::SyncSchedulerImpl(const std::string& name,
|
| cycle_context_(context),
|
| next_sync_cycle_job_priority_(NORMAL_PRIORITY),
|
| ignore_auth_credentials_(ignore_auth_credentials),
|
| - weak_ptr_factory_(this),
|
| - weak_ptr_factory_for_weak_handle_(this) {
|
| - weak_handle_this_ =
|
| - MakeWeakHandle(weak_ptr_factory_for_weak_handle_.GetWeakPtr());
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| SyncSchedulerImpl::~SyncSchedulerImpl() {
|
| DCHECK(CalledOnValidThread());
|
|
|