sync/engine/apply_updates_command_unittest.cc - Issue 10916036: [Sync] Implement keystore migration support.

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/engine/apply_updates_command_unittest.cc

Issue 10916036: [Sync] Implement keystore migration support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Self review 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

Index: sync/engine/apply_updates_command_unittest.cc

diff --git a/sync/engine/apply_updates_command_unittest.cc b/sync/engine/apply_updates_command_unittest.cc

index 5e14c59e4761ef0b2251a47f3c29299c940de5b4..04df2bf3e18f8107e84ec112ed788d0d8ddfb174 100644

--- a/sync/engine/apply_updates_command_unittest.cc

+++ b/sync/engine/apply_updates_command_unittest.cc

@@ -536,7 +536,7 @@ TEST_F(ApplyUpdatesCommandTest, NigoriUpdate) {

sync_pb::EntitySpecifics specifics;

sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();

- other_cryptographer.GetKeys(nigori->mutable_encrypted());

+ other_cryptographer.GetKeys(nigori->mutable_encryption_keybag());

nigori->set_encrypt_everything(true);

entry_factory_->CreateUnappliedNewItem(

ModelTypeToRootTag(NIGORI), specifics, true);

@@ -586,7 +586,7 @@ TEST_F(ApplyUpdatesCommandTest, NigoriUpdateForDisabledTypes) {

sync_pb::EntitySpecifics specifics;

sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();

- other_cryptographer.GetKeys(nigori->mutable_encrypted());

+ other_cryptographer.GetKeys(nigori->mutable_encryption_keybag());

nigori->set_encrypt_everything(true);

entry_factory_->CreateUnappliedNewItem(

ModelTypeToRootTag(NIGORI), specifics, true);

@@ -666,7 +666,7 @@ TEST_F(ApplyUpdatesCommandTest, EncryptUnsyncedChanges) {

cryptographer->AddKey(params);

sync_pb::EntitySpecifics specifics;

sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();

- cryptographer->GetKeys(nigori->mutable_encrypted());

+ cryptographer->GetKeys(nigori->mutable_encryption_keybag());

nigori->set_encrypt_everything(true);

encrypted_types.Put(BOOKMARKS);

entry_factory_->CreateUnappliedNewItem(

@@ -808,7 +808,7 @@ TEST_F(ApplyUpdatesCommandTest, CannotEncryptUnsyncedChanges) {

other_cryptographer.AddKey(params);

sync_pb::EntitySpecifics specifics;

sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();

- other_cryptographer.GetKeys(nigori->mutable_encrypted());

+ other_cryptographer.GetKeys(nigori->mutable_encryption_keybag());

nigori->set_encrypt_everything(true);

encrypted_types.Put(BOOKMARKS);

entry_factory_->CreateUnappliedNewItem(

« no previous file with comments | « no previous file | sync/engine/conflict_resolver.cc » ('j') | sync/internal_api/sync_encryption_handler_impl.h » ('J')