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

Unified Diff: sync/syncable/nigori_util.h

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: sync/syncable/nigori_util.h
diff --git a/sync/syncable/nigori_util.h b/sync/syncable/nigori_util.h
index 0c020b464e298826961b6e70cc0c2dc5a5ad4346..7eefed42f2a6cb539d2778672964dfa7ad542d06 100644
--- a/sync/syncable/nigori_util.h
+++ b/sync/syncable/nigori_util.h
@@ -40,8 +40,7 @@ bool VerifyUnsyncedChangesAreEncrypted(
// Processes all unsynced changes and ensures they are appropriately encrypted
// or unencrypted, based on |encrypted_types|.
bool ProcessUnsyncedChangesForEncryption(
- WriteTransaction* const trans,
- Cryptographer* cryptographer);
+ WriteTransaction* const trans);
// Returns true if the entry requires encryption but is not encrypted, false
// otherwise. Note: this does not check that already encrypted entries are
@@ -56,7 +55,6 @@ bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
// Verifies all data of type |type| is encrypted appropriately.
bool VerifyDataTypeEncryptionForTest(
BaseTransaction* const trans,
- Cryptographer* cryptographer,
ModelType type,
bool is_encrypted) WARN_UNUSED_RESULT;
@@ -64,7 +62,7 @@ bool VerifyDataTypeEncryptionForTest(
// Returns false if an error encrypting occurred (does not modify |entry|).
// Note: gracefully handles new_specifics aliasing with entry->Get(SPECIFICS).
bool UpdateEntryWithEncryption(
- Cryptographer* cryptographer,
+ BaseTransaction* const trans,
const sync_pb::EntitySpecifics& new_specifics,
MutableEntry* entry);

Powered by Google App Engine
This is Rietveld 408576698