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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always trigger OnEncryptedTypesChanged on init Created 8 years, 4 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/internal_api/test/test_user_share.cc » ('j') | no next file with comments »
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 48b81c186a3f05c00b6fcbf56e7aba569d406501..a877486b7ee432de631a11ed06816debf85487a1 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -227,35 +227,25 @@ class SyncApiTest : public testing::Test {
public:
virtual void SetUp() {
test_user_share_.SetUp();
- SetUpEncryption();
}
virtual void TearDown() {
test_user_share_.TearDown();
}
- void SetUpEncryption() {
- ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
- encryption_handler_.reset(
- new SyncEncryptionHandlerImpl(test_user_share_.user_share(),
- trans.GetCryptographer()));
- trans.GetCryptographer()->SetNigoriHandler(encryption_handler_.get());
- }
-
protected:
MessageLoop message_loop_;
TestUserShare test_user_share_;
- scoped_ptr<SyncEncryptionHandlerImpl> encryption_handler_;
};
TEST_F(SyncApiTest, SanityCheckTest) {
{
ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
- EXPECT_TRUE(trans.GetWrappedTrans() != NULL);
+ EXPECT_TRUE(trans.GetWrappedTrans());
}
{
WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
- EXPECT_TRUE(trans.GetWrappedTrans() != NULL);
+ EXPECT_TRUE(trans.GetWrappedTrans());
}
{
// No entries but root should exist
@@ -485,7 +475,7 @@ TEST_F(SyncApiTest, WriteEncryptedTitle) {
ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
trans.GetCryptographer()->AddKey(params);
}
- encryption_handler_->EnableEncryptEverything();
+ test_user_share_.encryption_handler()->EnableEncryptEverything();
{
WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
ReadNode root_node(&trans);
@@ -861,7 +851,7 @@ class SyncManagerTest : public testing::Test,
if (nigori_status == WRITE_TO_NIGORI) {
sync_pb::NigoriSpecifics nigori;
cryptographer->GetKeys(nigori.mutable_encrypted());
- cryptographer->UpdateNigoriFromEncryptedTypes(
+ share->directory->GetNigoriHandler()->UpdateNigoriFromEncryptedTypes(
&nigori,
trans.GetWrappedTrans());
WriteNode node(&trans);
@@ -924,9 +914,14 @@ class SyncManagerTest : public testing::Test,
// Gets the set of encrypted types from the cryptographer
// Note: opens a transaction. May be called from any thread.
- syncer::ModelTypeSet GetEncryptedDataTypesForTest() {
+ ModelTypeSet GetEncryptedTypes() {
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- return GetEncryptedTypes(&trans);
+ return GetEncryptedTypesWithTrans(&trans);
+ }
+
+ ModelTypeSet GetEncryptedTypesWithTrans(BaseTransaction* trans) {
+ return trans->GetDirectory()->GetNigoriHandler()->
+ GetEncryptedTypes(trans->GetWrappedTrans());
}
void SimulateEnableNotificationsForTest() {
@@ -1379,11 +1374,12 @@ TEST_F(SyncManagerTest, RefreshEncryptionReady) {
EXPECT_TRUE(SetUpEncryption(WRITE_TO_NIGORI, DEFAULT_ENCRYPTION));
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
- const ModelTypeSet encrypted_types = GetEncryptedDataTypesForTest();
+ const ModelTypeSet encrypted_types = GetEncryptedTypes();
EXPECT_TRUE(encrypted_types.Has(PASSWORDS));
EXPECT_FALSE(EncryptEverythingEnabledForTest());
@@ -1408,10 +1404,11 @@ TEST_F(SyncManagerTest, RefreshEncryptionNotReady) {
// is not ready.
EXPECT_CALL(encryption_observer_, OnPassphraseRequired(_, _)).Times(1);
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
- const ModelTypeSet encrypted_types = GetEncryptedDataTypesForTest();
+ const ModelTypeSet encrypted_types = GetEncryptedTypes();
EXPECT_TRUE(encrypted_types.Has(PASSWORDS)); // Hardcoded.
EXPECT_FALSE(EncryptEverythingEnabledForTest());
}
@@ -1421,12 +1418,13 @@ TEST_F(SyncManagerTest, RefreshEncryptionEmptyNigori) {
EXPECT_TRUE(SetUpEncryption(DONT_WRITE_NIGORI, DEFAULT_ENCRYPTION));
EXPECT_CALL(encryption_observer_, OnEncryptionComplete()).Times(1);
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
// Should write to nigori.
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
- const ModelTypeSet encrypted_types = GetEncryptedDataTypesForTest();
+ const ModelTypeSet encrypted_types = GetEncryptedTypes();
EXPECT_TRUE(encrypted_types.Has(PASSWORDS)); // Hardcoded.
EXPECT_FALSE(EncryptEverythingEnabledForTest());
@@ -1483,21 +1481,18 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- EXPECT_TRUE(GetEncryptedTypes(&trans).Equals(
+ EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals(
SyncEncryptionHandler::SensitiveTypes()));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
BOOKMARKS,
false /* not encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
SESSIONS,
false /* not encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
THEMES,
false /* not encrypted */));
}
@@ -1510,21 +1505,18 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
EXPECT_TRUE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- EXPECT_TRUE(GetEncryptedTypes(&trans).Equals(
+ EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals(
ModelTypeSet::All()));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
BOOKMARKS,
true /* is encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
SESSIONS,
true /* is encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
THEMES,
true /* is encrypted */));
}
@@ -1540,20 +1532,17 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
EXPECT_TRUE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- EXPECT_TRUE(GetEncryptedTypes(&trans).Equals(ModelTypeSet::All()));
+ EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals(ModelTypeSet::All()));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
BOOKMARKS,
true /* is encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
SESSIONS,
true /* is encrypted */));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
THEMES,
true /* is encrypted */));
}
@@ -2014,7 +2003,6 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
BOOKMARKS,
false /* not encrypted */));
}
@@ -2028,10 +2016,9 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- EXPECT_TRUE(GetEncryptedTypes(&trans).Equals(ModelTypeSet::All()));
+ EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals(ModelTypeSet::All()));
EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
trans.GetWrappedTrans(),
- trans.GetCryptographer(),
BOOKMARKS,
true /* is encrypted */));
@@ -2114,6 +2101,7 @@ TEST_F(SyncManagerTest, UpdateEntryWithEncryption) {
EXPECT_TRUE(SetUpEncryption(WRITE_TO_NIGORI, FULL_ENCRYPTION));
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, true));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
{
@@ -2161,6 +2149,7 @@ TEST_F(SyncManagerTest, UpdateEntryWithEncryption) {
testing::Mock::VerifyAndClearExpectations(&encryption_observer_);
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
@@ -2367,6 +2356,7 @@ TEST_F(SyncManagerTest, UpdatePasswordReencryptEverything) {
testing::Mock::VerifyAndClearExpectations(&encryption_observer_);
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, false));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
EXPECT_FALSE(ResetUnsyncedEntry(PASSWORDS, client_tag));
@@ -2429,6 +2419,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitleWithEncryption) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_TRUE(SetUpEncryption(WRITE_TO_NIGORI, FULL_ENCRYPTION));
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, true));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
EXPECT_TRUE(ResetUnsyncedEntry(BOOKMARKS, client_tag));
@@ -2525,6 +2516,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitleWithEncryption) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_TRUE(SetUpEncryption(WRITE_TO_NIGORI, FULL_ENCRYPTION));
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_, OnEncryptedTypesChanged(_, true));
sync_manager_.GetEncryptionHandler()->Init();
PumpLoop();
EXPECT_TRUE(ResetUnsyncedEntry(PREFERENCES, client_tag));
« sync/internal_api/sync_encryption_handler_impl.cc ('K') | « sync/internal_api/sync_manager_impl.cc ('k') | sync/internal_api/test/test_user_share.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698