sync/engine/apply_control_data_updates_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_control_data_updates_unittest.cc

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

Patch Set: Rebase Created 8 years, 3 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_control_data_updates_unittest.cc

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

index dbfc98d91cd5c4432e3ad026b42e223adcf9df3c..7f1a9fad6e238141526b521613048207adc2c47b 100644

--- a/sync/engine/apply_control_data_updates_unittest.cc

+++ b/sync/engine/apply_control_data_updates_unittest.cc

@@ -82,7 +82,7 @@ TEST_F(ApplyControlDataUpdatesTest, 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);

@@ -126,7 +126,7 @@ TEST_F(ApplyControlDataUpdatesTest, 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);

@@ -194,7 +194,7 @@ TEST_F(ApplyControlDataUpdatesTest, 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(

@@ -307,7 +307,7 @@ TEST_F(ApplyControlDataUpdatesTest, 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 | « sync/engine/apply_control_data_updates.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »