sync/internal_api/sync_encryption_handler_impl_unittest.cc - Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/sync_encryption_handler_impl_unittest.cc

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master

Patch Set: Created 6 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

« sync/internal_api/public/sync_encryption_handler.cc ('K') | « sync/internal_api/public/sync_encryption_handler.cc ('k') | sync/protocol/BUILD.gn » ('j') | sync/protocol/proto_enum_conversions.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/sync_encryption_handler_impl_unittest.cc

diff --git a/sync/internal_api/sync_encryption_handler_impl_unittest.cc b/sync/internal_api/sync_encryption_handler_impl_unittest.cc

index 5aad1b037d010c04fc3b95672e873b90738d2d99..d878fda7dd89d956128d3d3b8b79ea95b55b89ac 100644

--- a/sync/internal_api/sync_encryption_handler_impl_unittest.cc

+++ b/sync/internal_api/sync_encryption_handler_impl_unittest.cc

@@ -423,7 +423,8 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) {

EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());

ModelTypeSet encrypted_types =

encryption_handler()->GetEncryptedTypesUnsafe();

- EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));

+ EXPECT_TRUE(encrypted_types.Equals(

+ ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));

{

WriteTransaction trans(FROM_HERE, user_share());

@@ -459,7 +460,8 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) {

EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());

ModelTypeSet encrypted_types =

encryption_handler()->GetEncryptedTypesUnsafe();

- EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));

+ EXPECT_TRUE(encrypted_types.Equals(

+ ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));

{

WriteTransaction trans(FROM_HERE, user_share());

@@ -503,7 +505,8 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) {

EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());

ModelTypeSet encrypted_types =

encryption_handler()->GetEncryptedTypesUnsafe();

- EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));

+ EXPECT_TRUE(encrypted_types.Equals(

+ ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));

{

WriteTransaction trans(FROM_HERE, user_share());

@@ -514,7 +517,8 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) {

EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());

encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();

- EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(BOOKMARKS, PASSWORDS)));

+ EXPECT_TRUE(encrypted_types.Equals(

+ ModelTypeSet(BOOKMARKS, PASSWORDS, WIFI_CREDENTIALS)));

}

// Receive an old nigori with old encryption keys and encrypted types. We should