| Index: components/sync/syncable/nigori_util.h
|
| diff --git a/components/sync/syncable/nigori_util.h b/components/sync/syncable/nigori_util.h
|
| index e8cf6706d80e9744ddd7bfa87259689dc1da9c9a..3d5d857b55a807d40ada90614ed1fb3f369ed8df 100644
|
| --- a/components/sync/syncable/nigori_util.h
|
| +++ b/components/sync/syncable/nigori_util.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/passphrase_type.h"
|
| #include "components/sync/protocol/nigori_specifics.pb.h"
|
|
|
| namespace sync_pb {
|
| @@ -61,6 +62,14 @@ bool UpdateEntryWithEncryption(BaseTransaction* const trans,
|
| const sync_pb::EntitySpecifics& new_specifics,
|
| MutableEntry* entry);
|
|
|
| +// Same as |UpdateEntryWithEncryption|, but with explicit |passphrase_type|
|
| +// which will be used to decide if the sensitive data should be removed before
|
| +// re-enctypting.
|
| +bool UpdateEntryWithEncryption(BaseTransaction* const trans,
|
| + const sync_pb::EntitySpecifics& new_specifics,
|
| + MutableEntry* entry,
|
| + PassphraseType passphrase_type);
|
| +
|
| // Updates |nigori| to match the encryption state specified by |encrypted_types|
|
| // and |encrypt_everything|.
|
| void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
|
|
|