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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8402014: [Sync] Make GetFirstChildId return a flag indicating success (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup comments 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/change_reorder_buffer.h ('K') | « chrome/browser/sync/internal_api/sync_manager.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | chrome/browser/sync/syncable/syncable.h » ('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 fd993c24485d398204aa83e5d865e3b16805b94d..d34c4ac11cb7b283b629cfebbfb6174bd9c5d1c6 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -1252,18 +1252,21 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(Cryptographer::SensitiveTypes(), GetEncryptedTypes(&trans));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::BOOKMARKS,
- false /* not encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::SESSIONS,
- false /* not encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::THEMES,
- false /* not encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::BOOKMARKS,
+ false /* not encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::SESSIONS,
+ false /* not encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::THEMES,
+ false /* not encrypted */));
}
EXPECT_CALL(observer_,
@@ -1274,18 +1277,21 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(GetAllRealModelTypes(), GetEncryptedTypes(&trans));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::BOOKMARKS,
- true /* is encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::SESSIONS,
- true /* is encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::THEMES,
- true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::BOOKMARKS,
+ true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::SESSIONS,
+ true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::THEMES,
+ true /* is encrypted */));
}
// Trigger's a ReEncryptEverything with new passphrase.
@@ -1297,18 +1303,21 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(GetAllRealModelTypes(), GetEncryptedTypes(&trans));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::BOOKMARKS,
- true /* is encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::SESSIONS,
- true /* is encrypted */));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::THEMES,
- true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::BOOKMARKS,
+ true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::SESSIONS,
+ true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::THEMES,
+ true /* is encrypted */));
}
// Calling EncryptDataTypes with an empty encrypted types should not trigger
// a reencryption and should just notify immediately.
@@ -1445,10 +1454,11 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::BOOKMARKS,
- false /* not encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::BOOKMARKS,
+ false /* not encrypted */));
}
EXPECT_CALL(observer_,
@@ -1460,10 +1470,11 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
EXPECT_EQ(GetAllRealModelTypes(), GetEncryptedTypes(&trans));
- EXPECT_TRUE(syncable::VerifyDataTypeEncryption(trans.GetWrappedTrans(),
- trans.GetCryptographer(),
- syncable::BOOKMARKS,
- true /* is encrypted */));
+ EXPECT_TRUE(syncable::VerifyDataTypeEncryptionForTest(
+ trans.GetWrappedTrans(),
+ trans.GetCryptographer(),
+ syncable::BOOKMARKS,
+ true /* is encrypted */));
ReadNode node(&trans);
EXPECT_TRUE(node.InitByIdLookup(node_id1));
« chrome/browser/sync/internal_api/change_reorder_buffer.h ('K') | « chrome/browser/sync/internal_api/sync_manager.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | chrome/browser/sync/syncable/syncable.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698