| 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 2d3f754f4b5fcb29aedefb5e3d4343c978aef7dd..b4d9b41b5d01fdcbd02e55b0f4024da0169ddb84 100644
|
| --- a/components/sync/engine_impl/cycle/nudge_tracker.cc
|
| +++ b/components/sync/engine_impl/cycle/nudge_tracker.cc
|
| @@ -154,7 +154,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);
|
| @@ -163,13 +163,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();
|
| @@ -384,7 +384,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;
|
|
|