Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: chrome/browser/sync/engine/update_applicator.cc

Issue 2828021: Take 2: sync changes to support encryption (Closed)
Patch Set: fix flaky password test under valgrind Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
« no previous file with comments | « chrome/browser/sync/engine/update_applicator.h ('k') | chrome/browser/sync/glue/password_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698