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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/internal_api/syncapi_unittest.cc

Issue 8356026: [Sync] Cache encrypted types info in ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove diff Created 9 years, 2 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
« chrome/browser/sync/internal_api/sync_manager.cc ('K') | « chrome/browser/sync/internal_api/sync_manager.cc ('k') | chrome/browser/sync/js/js_sync_manager_observer.h » ('j') | chrome/browser/sync/util/cryptographer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/internal_api/syncapi_unittest.cc
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
index 24dcffa8e36f8021aef6456e6544986a562aa85d..fd993c24485d398204aa83e5d865e3b16805b94d 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -629,7 +629,9 @@ class SyncManagerObserverMock : public SyncManager::Observer {
MOCK_METHOD1(OnUpdatedToken, void(const std::string&)); // NOLINT
MOCK_METHOD0(OnClearServerDataFailed, void()); // NOLINT
MOCK_METHOD0(OnClearServerDataSucceeded, void()); // NOLINT
- MOCK_METHOD1(OnEncryptionComplete, void(const ModelTypeSet&)); // NOLINT
+ MOCK_METHOD2(OnEncryptedTypesChanged,
+ void(const ModelTypeSet&, bool)); // NOLINT
+ MOCK_METHOD0(OnEncryptionComplete, void()); // NOLINT
MOCK_METHOD1(OnActionableError,
void(const browser_sync::SyncProtocolError&)); // NOLINT
};
@@ -1195,9 +1197,9 @@ TEST_F(SyncManagerTest, RefreshEncryptionReady) {
EXPECT_TRUE(SetUpEncryption());
sync_manager_.RefreshEncryption();
syncable::ModelTypeSet encrypted_types =
- sync_manager_.GetEncryptedDataTypes();
+ sync_manager_.GetEncryptedDataTypesForTest();
EXPECT_EQ(1U, encrypted_types.count(syncable::PASSWORDS));
- EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_FALSE(sync_manager_.EncryptEverythingEnabledForTest());
}
// Attempt to refresh encryption when nigori not downloaded.
@@ -1205,16 +1207,18 @@ TEST_F(SyncManagerTest, RefreshEncryptionNotReady) {
// Don't set up encryption (no nigori node created).
sync_manager_.RefreshEncryption(); // Should fail.
syncable::ModelTypeSet encrypted_types =
- sync_manager_.GetEncryptedDataTypes();
+ sync_manager_.GetEncryptedDataTypesForTest();
EXPECT_EQ(1U, encrypted_types.count(syncable::PASSWORDS)); // Hardcoded.
- EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_FALSE(sync_manager_.EncryptEverythingEnabledForTest());
}
TEST_F(SyncManagerTest, EncryptDataTypesWithNoData) {
EXPECT_TRUE(SetUpEncryption());
- EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+ EXPECT_CALL(observer_,
+ OnEncryptedTypesChanged(GetAllRealModelTypes(), true));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.EnableEncryptEverything();
- EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_TRUE(sync_manager_.EncryptEverythingEnabledForTest());
}
TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
@@ -1262,9 +1266,11 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
false /* not encrypted */));
}
- EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+ EXPECT_CALL(observer_,
+ OnEncryptedTypesChanged(GetAllRealModelTypes(), true));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.EnableEncryptEverything();
- EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_TRUE(sync_manager_.EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(GetAllRealModelTypes(), GetEncryptedTypes(&trans));
@@ -1284,10 +1290,10 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
// Trigger's a ReEncryptEverything with new passphrase.
testing::Mock::VerifyAndClearExpectations(&observer_);
- EXPECT_CALL(observer_, OnPassphraseAccepted(_)).Times(1);
- EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes())).Times(1);
+ EXPECT_CALL(observer_, OnPassphraseAccepted(_));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.SetPassphrase("new_passphrase", true);
- EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_TRUE(sync_manager_.EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(GetAllRealModelTypes(), GetEncryptedTypes(&trans));
@@ -1309,7 +1315,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
// TODO(zea): add logic to ensure nothing was written.
testing::Mock::VerifyAndClearExpectations(&observer_);
EXPECT_CALL(observer_, OnPassphraseAccepted(_)).Times(0);
- EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes())).Times(1);
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.EnableEncryptEverything();
}
@@ -1328,9 +1334,9 @@ TEST_F(SyncManagerTest, SetPassphraseWithPassword) {
password_node.SetPasswordSpecifics(data);
}
EXPECT_CALL(observer_, OnPassphraseAccepted(_));
- EXPECT_CALL(observer_, OnEncryptionComplete(_));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.SetPassphrase("new_passphrase", true);
- EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_FALSE(sync_manager_.EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
ReadNode password_node(&trans);
@@ -1357,9 +1363,9 @@ TEST_F(SyncManagerTest, SetPassphraseWithEmptyPasswordNode) {
node_id = password_node.GetId();
}
EXPECT_CALL(observer_, OnPassphraseAccepted(_));
- EXPECT_CALL(observer_, OnEncryptionComplete(_));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.SetPassphrase("new_passphrase", true);
- EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_FALSE(sync_manager_.EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
ReadNode password_node(&trans);
@@ -1445,9 +1451,11 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
false /* not encrypted */));
}
- EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+ EXPECT_CALL(observer_,
+ OnEncryptedTypesChanged(GetAllRealModelTypes(), true));
+ EXPECT_CALL(observer_, OnEncryptionComplete());
sync_manager_.EnableEncryptEverything();
- EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
+ EXPECT_TRUE(sync_manager_.EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
« chrome/browser/sync/internal_api/sync_manager.cc ('K') | « chrome/browser/sync/internal_api/sync_manager.cc ('k') | chrome/browser/sync/js/js_sync_manager_observer.h » ('j') | chrome/browser/sync/util/cryptographer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698