Commit d869812e authored by Maksim Moskvitin's avatar Maksim Moskvitin Committed by Commit Bot

[Sync:USS] Implement GetKeystoreMigrationTime()

GetKeystoreMigrationTime() is a simple getter used for logging
purposes.

Bug: 922900
Change-Id: I6968a7eb7a315a1b4bbf2974ee2acfcda2d0bd67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814198
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701236}
parent 4b441688
...@@ -724,8 +724,7 @@ bool NigoriSyncBridgeImpl::IsEncryptEverythingEnabled() const { ...@@ -724,8 +724,7 @@ bool NigoriSyncBridgeImpl::IsEncryptEverythingEnabled() const {
base::Time NigoriSyncBridgeImpl::GetKeystoreMigrationTime() const { base::Time NigoriSyncBridgeImpl::GetKeystoreMigrationTime() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
NOTIMPLEMENTED(); return state_.keystore_migration_time;
return base::Time();
} }
KeystoreKeysHandler* NigoriSyncBridgeImpl::GetKeystoreKeysHandler() { KeystoreKeysHandler* NigoriSyncBridgeImpl::GetKeystoreKeysHandler() {
......
...@@ -193,6 +193,7 @@ sync_pb::NigoriSpecifics BuildKeystoreNigoriSpecifics( ...@@ -193,6 +193,7 @@ sync_pb::NigoriSpecifics BuildKeystoreNigoriSpecifics(
specifics.mutable_keystore_decryptor_token())); specifics.mutable_keystore_decryptor_token()));
specifics.set_passphrase_type(sync_pb::NigoriSpecifics::KEYSTORE_PASSPHRASE); specifics.set_passphrase_type(sync_pb::NigoriSpecifics::KEYSTORE_PASSPHRASE);
specifics.set_keystore_migration_time(TimeToProtoTime(base::Time::Now()));
return specifics; return specifics;
} }
...@@ -394,6 +395,7 @@ TEST_F(NigoriSyncBridgeImplTest, ...@@ -394,6 +395,7 @@ TEST_F(NigoriSyncBridgeImplTest,
NotNull(), /*has_pending_keys=*/false)); NotNull(), /*has_pending_keys=*/false));
EXPECT_THAT(bridge()->MergeSyncData(std::move(entity_data)), EXPECT_THAT(bridge()->MergeSyncData(std::move(entity_data)),
Eq(base::nullopt)); Eq(base::nullopt));
EXPECT_THAT(bridge()->GetKeystoreMigrationTime(), Not(NullTime()));
const Cryptographer& cryptographer = bridge()->GetCryptographerForTesting(); const Cryptographer& cryptographer = bridge()->GetCryptographerForTesting();
EXPECT_THAT(cryptographer, CanDecryptWith(kKeystoreKeyParams)); EXPECT_THAT(cryptographer, CanDecryptWith(kKeystoreKeyParams));
...@@ -497,12 +499,13 @@ TEST_F(NigoriSyncBridgeImplTest, ...@@ -497,12 +499,13 @@ TEST_F(NigoriSyncBridgeImplTest,
EXPECT_THAT(bridge()->MergeSyncData(std::move(default_entity_data)), EXPECT_THAT(bridge()->MergeSyncData(std::move(default_entity_data)),
Eq(base::nullopt)); Eq(base::nullopt));
EXPECT_THAT(bridge()->GetData(), HasKeystoreNigori()); EXPECT_THAT(bridge()->GetData(), HasKeystoreNigori());
EXPECT_THAT(bridge()->GetKeystoreMigrationTime(), Not(NullTime()));
EXPECT_EQ(bridge()->GetPassphraseTypeForTesting(),
sync_pb::NigoriSpecifics::KEYSTORE_PASSPHRASE);
const Cryptographer& cryptographer = bridge()->GetCryptographerForTesting(); const Cryptographer& cryptographer = bridge()->GetCryptographerForTesting();
EXPECT_THAT(cryptographer, CanDecryptWith(kKeystoreKeyParams)); EXPECT_THAT(cryptographer, CanDecryptWith(kKeystoreKeyParams));
EXPECT_THAT(cryptographer, HasDefaultKeyDerivedFrom(kKeystoreKeyParams)); EXPECT_THAT(cryptographer, HasDefaultKeyDerivedFrom(kKeystoreKeyParams));
// TODO(crbug.com/922900): verify that passphrase type is equal to
// KeystorePassphrase once passphrase type support is implemented.
} }
// Tests that we can perform initial sync with custom passphrase Nigori. // Tests that we can perform initial sync with custom passphrase Nigori.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment