| Index: chrome/browser/sync/engine/update_applicator.cc
|
| diff --git a/chrome/browser/sync/engine/update_applicator.cc b/chrome/browser/sync/engine/update_applicator.cc
|
| index bcab9d47c023386e0cd105aa332819472382c1c7..a1743707a85e1684cd71e39e25a4e52c6fad9bb0 100644
|
| --- a/chrome/browser/sync/engine/update_applicator.cc
|
| +++ b/chrome/browser/sync/engine/update_applicator.cc
|
| @@ -17,11 +17,13 @@ using std::vector;
|
| namespace browser_sync {
|
|
|
| UpdateApplicator::UpdateApplicator(ConflictResolver* resolver,
|
| + Cryptographer* cryptographer,
|
| const UpdateIterator& begin,
|
| const UpdateIterator& end,
|
| const ModelSafeRoutingInfo& routes,
|
| ModelSafeGroup group_filter)
|
| : resolver_(resolver),
|
| + cryptographer_(cryptographer),
|
| begin_(begin),
|
| end_(end),
|
| pointer_(begin),
|
| @@ -58,8 +60,8 @@ bool UpdateApplicator::AttemptOneApplication(
|
| }
|
|
|
| syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE, *pointer_);
|
| - UpdateAttemptResponse updateResponse =
|
| - SyncerUtil::AttemptToUpdateEntry(trans, &entry, resolver_);
|
| + UpdateAttemptResponse updateResponse = SyncerUtil::AttemptToUpdateEntry(
|
| + trans, &entry, resolver_, cryptographer_);
|
| switch (updateResponse) {
|
| case SUCCESS:
|
| Advance();
|
|
|