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

Unified Diff: components/sync/core_impl/sync_encryption_handler_impl.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
Index: components/sync/core_impl/sync_encryption_handler_impl.h
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/components/sync/core_impl/sync_encryption_handler_impl.h
similarity index 94%
rename from sync/internal_api/sync_encryption_handler_impl.h
rename to components/sync/core_impl/sync_encryption_handler_impl.h
index b8fcf7629265c0ac600d195001aee63ac860dbed..25b4d014f5ba29e79b3428f84dce8c00b8b6afe6 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/components/sync/core_impl/sync_encryption_handler_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SYNC_INTERNAL_API_SYNC_ENCRYPTION_HANDLER_IMPL_H_
-#define SYNC_INTERNAL_API_SYNC_ENCRYPTION_HANDLER_IMPL_H_
+#ifndef COMPONENTS_SYNC_CORE_IMPL_SYNC_ENCRYPTION_HANDLER_IMPL_H_
+#define COMPONENTS_SYNC_CORE_IMPL_SYNC_ENCRYPTION_HANDLER_IMPL_H_
#include <string>
#include <vector>
@@ -15,10 +15,10 @@
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/sync_encryption_handler.h"
-#include "sync/syncable/nigori_handler.h"
-#include "sync/util/cryptographer.h"
+#include "components/sync/base/cryptographer.h"
+#include "components/sync/base/sync_export.h"
+#include "components/sync/core/sync_encryption_handler.h"
+#include "components/sync/syncable/nigori_handler.h"
namespace syncer {
@@ -103,8 +103,7 @@ class SYNC_EXPORT SyncEncryptionHandlerImpl : public SyncEncryptionHandler,
EncryptEverythingImplicit);
FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
UnknownSensitiveTypes);
- FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
- GetKeystoreDecryptor);
+ FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest, GetKeystoreDecryptor);
FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
ReceiveMigratedNigoriKeystorePass);
FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
@@ -169,9 +168,8 @@ class SYNC_EXPORT SyncEncryptionHandlerImpl : public SyncEncryptionHandler,
// had stricter encryption than |nigori|, and the nigori node needs to be
// updated with the newer encryption state.
// Note: must be called from within a transaction.
- bool UpdateEncryptedTypesFromNigori(
- const sync_pb::NigoriSpecifics& nigori,
- syncable::BaseTransaction* const trans);
+ bool UpdateEncryptedTypesFromNigori(const sync_pb::NigoriSpecifics& nigori,
+ syncable::BaseTransaction* const trans);
// TODO(zea): make these public and have them replace SetEncryptionPassphrase
// and SetDecryptionPassphrase.
@@ -240,10 +238,9 @@ class SYNC_EXPORT SyncEncryptionHandlerImpl : public SyncEncryptionHandler,
// |encrypted_blob|'s contents didn't already contain the key.
// The keystore decryptor token is the serialized current default encryption
// key, encrypted with the keystore key.
- bool GetKeystoreDecryptor(
- const Cryptographer& cryptographer,
- const std::string& keystore_key,
- sync_pb::EncryptedData* encrypted_blob);
+ bool GetKeystoreDecryptor(const Cryptographer& cryptographer,
+ const std::string& keystore_key,
+ sync_pb::EncryptedData* encrypted_blob);
// Helper method for installing the keys encrypted in |encryption_keybag|
// into |cryptographer|.
@@ -321,4 +318,4 @@ class SYNC_EXPORT SyncEncryptionHandlerImpl : public SyncEncryptionHandler,
} // namespace syncer
-#endif // SYNC_INTERNAL_API_SYNC_ENCRYPTION_HANDLER_IMPL_H_
+#endif // COMPONENTS_SYNC_CORE_IMPL_SYNC_ENCRYPTION_HANDLER_IMPL_H_
« no previous file with comments | « components/sync/core_impl/protocol_event_buffer_unittest.cc ('k') | components/sync/core_impl/sync_encryption_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698