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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 10916036: [Sync] Implement keystore migration support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 3 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
« sync/internal_api/sync_encryption_handler_impl.cc ('K') | « sync/internal_api/sync_manager_impl.cc ('k') | sync/protocol/client_debug_info.proto » ('j') | sync/protocol/nigori_specifics.proto » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index ec08939df59a0a5f0e071b57d88b585956ec26af..2c421ebb44e9bcb2f874f92914203e457a973847 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -699,7 +699,7 @@ class SyncEncryptionHandlerObserverMock
void(ModelTypeSet, bool)); // NOLINT
MOCK_METHOD0(OnEncryptionComplete, void()); // NOLINT
MOCK_METHOD1(OnCryptographerStateChanged, void(Cryptographer*)); // NOLINT
- MOCK_METHOD1(OnPassphraseStateChanged, void(PassphraseState)); // NOLINT
+ MOCK_METHOD1(OnPassphraseTypeChanged, void(PassphraseType)); // NOLINT
};
} // namespace
@@ -832,7 +832,7 @@ class SyncManagerTest : public testing::Test,
}
if (nigori_status == WRITE_TO_NIGORI) {
sync_pb::NigoriSpecifics nigori;
- cryptographer->GetKeys(nigori.mutable_encrypted());
+ cryptographer->GetKeys(nigori.mutable_encryption_keybag());
share->directory->GetNigoriHandler()->UpdateNigoriFromEncryptedTypes(
&nigori,
trans.GetWrappedTrans());
@@ -1368,10 +1368,10 @@ TEST_F(SyncManagerTest, RefreshEncryptionReady) {
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByIdLookup(GetIdForDataType(NIGORI)));
sync_pb::NigoriSpecifics nigori = node.GetNigoriSpecifics();
- EXPECT_TRUE(nigori.has_encrypted());
+ EXPECT_TRUE(nigori.has_encryption_keybag());
Cryptographer* cryptographer = trans.GetCryptographer();
EXPECT_TRUE(cryptographer->is_ready());
- EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encrypted()));
+ EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encryption_keybag()));
}
}
@@ -1413,10 +1413,10 @@ TEST_F(SyncManagerTest, RefreshEncryptionEmptyNigori) {
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByIdLookup(GetIdForDataType(NIGORI)));
sync_pb::NigoriSpecifics nigori = node.GetNigoriSpecifics();
- EXPECT_TRUE(nigori.has_encrypted());
+ EXPECT_TRUE(nigori.has_encryption_keybag());
Cryptographer* cryptographer = trans.GetCryptographer();
EXPECT_TRUE(cryptographer->is_ready());
- EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encrypted()));
+ EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encryption_keybag()));
}
}
@@ -1508,7 +1508,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase", true);
EXPECT_TRUE(EncryptEverythingEnabledForTest());
@@ -1552,7 +1552,7 @@ TEST_F(SyncManagerTest, SetInitialGaiaPass) {
"new_passphrase",
false);
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1561,7 +1561,7 @@ TEST_F(SyncManagerTest, SetInitialGaiaPass) {
sync_pb::NigoriSpecifics nigori = node.GetNigoriSpecifics();
Cryptographer* cryptographer = trans.GetCryptographer();
EXPECT_TRUE(cryptographer->is_ready());
- EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encrypted()));
+ EXPECT_TRUE(cryptographer->CanDecrypt(nigori.encryption_keybag()));
}
}
@@ -1587,7 +1587,7 @@ TEST_F(SyncManagerTest, UpdateGaiaPass) {
"new_passphrase",
false);
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1632,12 +1632,12 @@ TEST_F(SyncManagerTest, SetPassphraseWithPassword) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
EXPECT_EQ(CUSTOM_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1679,8 +1679,8 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPass) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByTagLookup(kNigoriTag));
sync_pb::NigoriSpecifics nigori;
- other_cryptographer.GetKeys(nigori.mutable_encrypted());
- cryptographer->SetPendingKeys(nigori.encrypted());
+ other_cryptographer.GetKeys(nigori.mutable_encryption_keybag());
+ cryptographer->SetPendingKeys(nigori.encryption_keybag());
EXPECT_TRUE(cryptographer->has_pending_keys());
node.SetNigoriSpecifics(nigori);
}
@@ -1691,7 +1691,7 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPass) {
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("passphrase2");
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1727,9 +1727,9 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByTagLookup(kNigoriTag));
sync_pb::NigoriSpecifics nigori;
- other_cryptographer.GetKeys(nigori.mutable_encrypted());
+ other_cryptographer.GetKeys(nigori.mutable_encryption_keybag());
node.SetNigoriSpecifics(nigori);
- cryptographer->SetPendingKeys(nigori.encrypted());
+ cryptographer->SetPendingKeys(nigori.encryption_keybag());
// other_cryptographer now contains all encryption keys, and is encrypting
// with the newest gaia.
@@ -1748,7 +1748,7 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) {
"new_gaia",
false);
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
testing::Mock::VerifyAndClearExpectations(&encryption_observer_);
{
@@ -1771,7 +1771,7 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) {
"old_gaia",
false);
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
Cryptographer* cryptographer = trans.GetCryptographer();
@@ -1810,22 +1810,26 @@ TEST_F(SyncManagerTest, SupplyPendingExplicitPass) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByTagLookup(kNigoriTag));
sync_pb::NigoriSpecifics nigori;
- other_cryptographer.GetKeys(nigori.mutable_encrypted());
- cryptographer->SetPendingKeys(nigori.encrypted());
+ other_cryptographer.GetKeys(nigori.mutable_encryption_keybag());
+ cryptographer->SetPendingKeys(nigori.encryption_keybag());
EXPECT_TRUE(cryptographer->has_pending_keys());
- nigori.set_using_explicit_passphrase(true);
+ nigori.set_frozen_keybag(true);
node.SetNigoriSpecifics(nigori);
}
+ EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
+ EXPECT_CALL(encryption_observer_, OnPassphraseRequired(_, _));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
+ sync_manager_.GetEncryptionHandler()->Init();
EXPECT_CALL(encryption_observer_,
OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN));
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
- EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("explicit");
EXPECT_EQ(CUSTOM_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1855,9 +1859,9 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPassUserProvided) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByTagLookup(kNigoriTag));
sync_pb::NigoriSpecifics nigori;
- other_cryptographer.GetKeys(nigori.mutable_encrypted());
+ other_cryptographer.GetKeys(nigori.mutable_encryption_keybag());
node.SetNigoriSpecifics(nigori);
- cryptographer->SetPendingKeys(nigori.encrypted());
+ cryptographer->SetPendingKeys(nigori.encryption_keybag());
EXPECT_FALSE(cryptographer->is_ready());
}
EXPECT_CALL(encryption_observer_,
@@ -1869,7 +1873,7 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPassUserProvided) {
"passphrase",
false);
EXPECT_EQ(IMPLICIT_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1899,12 +1903,12 @@ TEST_F(SyncManagerTest, SetPassphraseWithEmptyPasswordNode) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
EXPECT_EQ(CUSTOM_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -2126,7 +2130,7 @@ TEST_F(SyncManagerTest, UpdateEntryWithEncryption) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
@@ -2325,12 +2329,12 @@ TEST_F(SyncManagerTest, UpdatePasswordNewPassphrase) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
EXPECT_CALL(encryption_observer_,
- OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
+ OnPassphraseTypeChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
EXPECT_EQ(CUSTOM_PASSPHRASE,
- sync_manager_.GetEncryptionHandler()->GetPassphraseState());
+ sync_manager_.GetEncryptionHandler()->GetPassphraseType());
EXPECT_TRUE(ResetUnsyncedEntry(PASSWORDS, client_tag));
}
« sync/internal_api/sync_encryption_handler_impl.cc ('K') | « sync/internal_api/sync_manager_impl.cc ('k') | sync/protocol/client_debug_info.proto » ('j') | sync/protocol/nigori_specifics.proto » ('J')

Powered by Google App Engine
This is Rietveld 408576698