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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer_util.cc

Issue 10827266: [Sync] Add SyncEncryptionHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 8 years, 4 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
« chrome/browser/sync/glue/sync_backend_host.cc ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/debug_info_event_listener.h » ('j') | sync/internal_api/sync_encryption_handler_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_util.cc
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc
index fedf4d8f54859528af88700e0d69538574987f7b..3d6bbce3aa8d87a75d3c3a0a3d3712150e1afd77 100644
--- a/sync/engine/syncer_util.cc
+++ b/sync/engine/syncer_util.cc
@@ -217,7 +217,7 @@ UpdateAttemptResponse AttemptToUpdateEntry(
// the nigori node (e.g. on restart), they will commit without issue.
if (specifics.has_nigori()) {
const sync_pb::NigoriSpecifics& nigori = specifics.nigori();
- cryptographer->Update(nigori);
+ cryptographer->UpdateFromNigori(nigori);
// Make sure any unsynced changes are properly encrypted as necessary.
// We only perform this if the cryptographer is ready. If not, these are
« chrome/browser/sync/glue/sync_backend_host.cc ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/debug_info_event_listener.h » ('j') | sync/internal_api/sync_encryption_handler_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698