Index: sync/engine/syncer.cc |
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc |
index ef759b8eace510dd00f8108979bf90a4db587233..bae809effb639ab3c8db58159adc51aa28ca6e56 100644 |
--- a/sync/engine/syncer.cc |
+++ b/sync/engine/syncer.cc |
@@ -55,13 +55,13 @@ |
} |
bool Syncer::NormalSyncShare(ModelTypeSet request_types, |
- NudgeTracker* nudge_tracker, |
+ const NudgeTracker& nudge_tracker, |
SyncSession* session) { |
HandleCycleBegin(session); |
- if (nudge_tracker->IsGetUpdatesRequired() || |
+ if (nudge_tracker.IsGetUpdatesRequired() || |
session->context()->ShouldFetchUpdatesBeforeCommit()) { |
VLOG(1) << "Downloading types " << ModelTypeSetToString(request_types); |
- NormalGetUpdatesDelegate normal_delegate(*nudge_tracker); |
+ NormalGetUpdatesDelegate normal_delegate(nudge_tracker); |
GetUpdatesProcessor get_updates_processor( |
session->context()->model_type_registry()->update_handler_map(), |
normal_delegate); |
@@ -70,18 +70,18 @@ |
session, |
&get_updates_processor, |
kCreateMobileBookmarksFolder)) { |
- return HandleCycleEnd(session, nudge_tracker->GetLegacySource()); |
+ return HandleCycleEnd(session, nudge_tracker.GetLegacySource()); |
} |
} |
VLOG(1) << "Committing from types " << ModelTypeSetToString(request_types); |
CommitProcessor commit_processor( |
session->context()->model_type_registry()->commit_contributor_map()); |
- SyncerError commit_result = BuildAndPostCommits(request_types, nudge_tracker, |
- session, &commit_processor); |
+ SyncerError commit_result = |
+ BuildAndPostCommits(request_types, session, &commit_processor); |
session->mutable_status_controller()->set_commit_result(commit_result); |
- return HandleCycleEnd(session, nudge_tracker->GetLegacySource()); |
+ return HandleCycleEnd(session, nudge_tracker.GetLegacySource()); |
} |
bool Syncer::ConfigureSyncShare( |
@@ -160,7 +160,6 @@ |
} |
SyncerError Syncer::BuildAndPostCommits(ModelTypeSet requested_types, |
- sessions::NudgeTracker* nudge_tracker, |
sessions::SyncSession* session, |
CommitProcessor* commit_processor) { |
// The ExitRequested() check is unnecessary, since we should start getting |
@@ -181,7 +180,8 @@ |
} |
SyncerError error = commit->PostAndProcessResponse( |
- nudge_tracker, session, session->mutable_status_controller(), |
+ session, |
+ session->mutable_status_controller(), |
session->context()->extensions_activity()); |
commit->CleanUp(); |
if (error != SYNCER_OK) { |