| Index: components/sync/engine_impl/cycle/nudge_tracker.cc
|
| diff --git a/components/sync/engine_impl/cycle/nudge_tracker.cc b/components/sync/engine_impl/cycle/nudge_tracker.cc
|
| index e8de465ceecc32fb5a407e0af3ad36debb793937..d7dadcbc4af26301e82b7304f9b63e9028ca468a 100644
|
| --- a/components/sync/engine_impl/cycle/nudge_tracker.cc
|
| +++ b/components/sync/engine_impl/cycle/nudge_tracker.cc
|
| @@ -157,7 +157,7 @@ base::TimeDelta NudgeTracker::RecordLocalRefreshRequest(ModelTypeSet types) {
|
| }
|
|
|
| base::TimeDelta NudgeTracker::RecordRemoteInvalidation(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| std::unique_ptr<InvalidationInterface> invalidation) {
|
| // Forward the invalidations to the proper recipient.
|
| TypeTrackerMap::const_iterator tracker_it = type_trackers_.find(type);
|
| @@ -166,13 +166,13 @@ base::TimeDelta NudgeTracker::RecordRemoteInvalidation(
|
| return remote_invalidation_nudge_delay_;
|
| }
|
|
|
| -void NudgeTracker::RecordInitialSyncRequired(syncer::ModelType type) {
|
| +void NudgeTracker::RecordInitialSyncRequired(ModelType type) {
|
| TypeTrackerMap::const_iterator tracker_it = type_trackers_.find(type);
|
| DCHECK(tracker_it != type_trackers_.end());
|
| tracker_it->second->RecordInitialSyncRequired();
|
| }
|
|
|
| -void NudgeTracker::RecordCommitConflict(syncer::ModelType type) {
|
| +void NudgeTracker::RecordCommitConflict(ModelType type) {
|
| TypeTrackerMap::const_iterator tracker_it = type_trackers_.find(type);
|
| DCHECK(tracker_it != type_trackers_.end());
|
| tracker_it->second->RecordCommitConflict();
|
| @@ -387,7 +387,7 @@ void NudgeTracker::OnReceivedCustomNudgeDelays(
|
| delay_map.begin();
|
| iter != delay_map.end(); ++iter) {
|
| ModelType type = iter->first;
|
| - DCHECK(syncer::ProtocolTypes().Has(type));
|
| + DCHECK(ProtocolTypes().Has(type));
|
| TypeTrackerMap::const_iterator type_iter = type_trackers_.find(type);
|
| if (type_iter == type_trackers_.end())
|
| continue;
|
|
|