| Index: components/sync/syncable/nigori_util.h
|
| diff --git a/components/sync/syncable/nigori_util.h b/components/sync/syncable/nigori_util.h
|
| index 344689dfc5a8e9ae710601575b7119e9808a9252..e8cf6706d80e9744ddd7bfa87259689dc1da9c9a 100644
|
| --- a/components/sync/syncable/nigori_util.h
|
| +++ b/components/sync/syncable/nigori_util.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "components/sync/base/model_type.h"
|
| -#include "components/sync/base/sync_export.h"
|
| #include "components/sync/protocol/nigori_specifics.pb.h"
|
|
|
| namespace sync_pb {
|
| @@ -34,9 +33,8 @@ class WriteTransaction;
|
| // false if some unsynced changes need to be encrypted.
|
| // This method is similar to ProcessUnsyncedChangesForEncryption but does not
|
| // modify the data and does not care if data is unnecessarily encrypted.
|
| -SYNC_EXPORT bool VerifyUnsyncedChangesAreEncrypted(
|
| - BaseTransaction* const trans,
|
| - ModelTypeSet encrypted_types);
|
| +bool VerifyUnsyncedChangesAreEncrypted(BaseTransaction* const trans,
|
| + ModelTypeSet encrypted_types);
|
|
|
| // Processes all unsynced changes and ensures they are appropriately encrypted
|
| // or unencrypted, based on |encrypted_types|.
|
| @@ -48,15 +46,13 @@ bool ProcessUnsyncedChangesForEncryption(WriteTransaction* const trans);
|
| bool EntryNeedsEncryption(ModelTypeSet encrypted_types, const Entry& entry);
|
|
|
| // Same as EntryNeedsEncryption, but looks at specifics.
|
| -SYNC_EXPORT bool SpecificsNeedsEncryption(
|
| - ModelTypeSet encrypted_types,
|
| - const sync_pb::EntitySpecifics& specifics);
|
| +bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
|
| + const sync_pb::EntitySpecifics& specifics);
|
|
|
| // Verifies all data of type |type| is encrypted appropriately.
|
| -SYNC_EXPORT bool VerifyDataTypeEncryptionForTest(BaseTransaction* const trans,
|
| - ModelType type,
|
| - bool is_encrypted)
|
| - WARN_UNUSED_RESULT;
|
| +bool VerifyDataTypeEncryptionForTest(BaseTransaction* const trans,
|
| + ModelType type,
|
| + bool is_encrypted) WARN_UNUSED_RESULT;
|
|
|
| // Stores |new_specifics| into |entry|, encrypting if necessary.
|
| // Returns false if an error encrypting occurred (does not modify |entry|).
|
| @@ -67,10 +63,9 @@ bool UpdateEntryWithEncryption(BaseTransaction* const trans,
|
|
|
| // Updates |nigori| to match the encryption state specified by |encrypted_types|
|
| // and |encrypt_everything|.
|
| -SYNC_EXPORT void UpdateNigoriFromEncryptedTypes(
|
| - ModelTypeSet encrypted_types,
|
| - bool encrypt_everything,
|
| - sync_pb::NigoriSpecifics* nigori);
|
| +void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
|
| + bool encrypt_everything,
|
| + sync_pb::NigoriSpecifics* nigori);
|
|
|
| // Extracts the set of encrypted types from a nigori node.
|
| ModelTypeSet GetEncryptedTypesFromNigori(
|
|
|