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

Unified Diff: components/sync/syncable/nigori_util.h

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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
« no previous file with comments | « components/sync/syncable/nigori_handler.cc ('k') | components/sync/syncable/nigori_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/nigori_util.h
diff --git a/sync/syncable/nigori_util.h b/components/sync/syncable/nigori_util.h
similarity index 79%
rename from sync/syncable/nigori_util.h
rename to components/sync/syncable/nigori_util.h
index c7e0a9d18aeda0dd27e045e5cc9c6d5a909a867a..344689dfc5a8e9ae710601575b7119e9808a9252 100644
--- a/sync/syncable/nigori_util.h
+++ b/components/sync/syncable/nigori_util.h
@@ -4,13 +4,13 @@
// Various utility methods for nigori-based multi-type encryption.
-#ifndef SYNC_SYNCABLE_NIGORI_UTIL_H_
-#define SYNC_SYNCABLE_NIGORI_UTIL_H_
+#ifndef COMPONENTS_SYNC_SYNCABLE_NIGORI_UTIL_H_
+#define COMPONENTS_SYNC_SYNCABLE_NIGORI_UTIL_H_
#include "base/compiler_specific.h"
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/protocol/nigori_specifics.pb.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 {
class EntitySpecifics;
@@ -40,14 +40,12 @@ SYNC_EXPORT bool VerifyUnsyncedChangesAreEncrypted(
// Processes all unsynced changes and ensures they are appropriately encrypted
// or unencrypted, based on |encrypted_types|.
-bool ProcessUnsyncedChangesForEncryption(
- WriteTransaction* const trans);
+bool ProcessUnsyncedChangesForEncryption(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
// encrypted with the proper key.
-bool EntryNeedsEncryption(ModelTypeSet encrypted_types,
- const Entry& entry);
+bool EntryNeedsEncryption(ModelTypeSet encrypted_types, const Entry& entry);
// Same as EntryNeedsEncryption, but looks at specifics.
SYNC_EXPORT bool SpecificsNeedsEncryption(
@@ -63,10 +61,9 @@ SYNC_EXPORT bool VerifyDataTypeEncryptionForTest(BaseTransaction* const trans,
// Stores |new_specifics| into |entry|, encrypting if necessary.
// Returns false if an error encrypting occurred (does not modify |entry|).
// Note: gracefully handles new_specifics aliasing with entry->GetSpecifics().
-bool UpdateEntryWithEncryption(
- BaseTransaction* const trans,
- const sync_pb::EntitySpecifics& new_specifics,
- MutableEntry* entry);
+bool UpdateEntryWithEncryption(BaseTransaction* const trans,
+ const sync_pb::EntitySpecifics& new_specifics,
+ MutableEntry* entry);
// Updates |nigori| to match the encryption state specified by |encrypted_types|
// and |encrypt_everything|.
@@ -82,4 +79,4 @@ ModelTypeSet GetEncryptedTypesFromNigori(
} // namespace syncable
} // namespace syncer
-#endif // SYNC_SYNCABLE_NIGORI_UTIL_H_
+#endif // COMPONENTS_SYNC_SYNCABLE_NIGORI_UTIL_H_
« no previous file with comments | « components/sync/syncable/nigori_handler.cc ('k') | components/sync/syncable/nigori_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698