| Index: sync/engine/nigori_util.h
|
| diff --git a/sync/engine/nigori_util.h b/sync/engine/nigori_util.h
|
| index 5e5c20ad43dfc2c34465fd26c0f2799048edc3c2..9d3e2de56adddac9851e3b5fa1c385c9bd34662a 100644
|
| --- a/sync/engine/nigori_util.h
|
| +++ b/sync/engine/nigori_util.h
|
| @@ -12,7 +12,7 @@
|
| #include "sync/internal_api/public/syncable/model_type.h"
|
| #include "sync/protocol/nigori_specifics.pb.h"
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
| class Cryptographer;
|
| }
|
|
|
| @@ -43,7 +43,7 @@ bool VerifyUnsyncedChangesAreEncrypted(
|
| // or unencrypted, based on |encrypted_types|.
|
| bool ProcessUnsyncedChangesForEncryption(
|
| WriteTransaction* const trans,
|
| - csync::Cryptographer* cryptographer);
|
| + syncer::Cryptographer* cryptographer);
|
|
|
| // Returns true if the entry requires encryption but is not encrypted, false
|
| // otherwise. Note: this does not check that already encrypted entries are
|
| @@ -58,7 +58,7 @@ bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
|
| // Verifies all data of type |type| is encrypted appropriately.
|
| bool VerifyDataTypeEncryptionForTest(
|
| BaseTransaction* const trans,
|
| - csync::Cryptographer* cryptographer,
|
| + syncer::Cryptographer* cryptographer,
|
| ModelType type,
|
| bool is_encrypted) WARN_UNUSED_RESULT;
|
|
|
| @@ -66,7 +66,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(
|
| - csync::Cryptographer* cryptographer,
|
| + syncer::Cryptographer* cryptographer,
|
| const sync_pb::EntitySpecifics& new_specifics,
|
| MutableEntry* entry);
|
|
|
|
|