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

Unified Diff: chrome/browser/sync/glue/typed_url_change_processor.cc

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always trigger OnEncryptedTypesChanged on init 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
Index: chrome/browser/sync/glue/typed_url_change_processor.cc
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc
index c98459ed4873ffbc8482198750d9d6689be6495c..c0fa9b373f34b78d2f7040a27274fb357ff5dc3a 100644
--- a/chrome/browser/sync/glue/typed_url_change_processor.cc
+++ b/chrome/browser/sync/glue/typed_url_change_processor.cc
@@ -137,7 +137,7 @@ bool TypedUrlChangeProcessor::CreateOrUpdateSyncNode(
} else if (result == syncer::BaseNode::INIT_FAILED_DECRYPT_IF_NECESSARY) {
// TODO(tim): Investigating bug 121587.
syncer::Cryptographer* crypto = trans->GetCryptographer();
- syncer::ModelTypeSet encrypted_types(crypto->GetEncryptedTypes());
+ syncer::ModelTypeSet encrypted_types(trans->GetEncryptedTypes());
const sync_pb::EntitySpecifics& specifics =
update_node.GetEntry()->Get(syncer::syncable::SPECIFICS);
CHECK(specifics.has_encrypted());

Powered by Google App Engine
This is Rietveld 408576698