sync/test/engine/test_directory_setter_upper.cc - Issue 10844005: [Sync] Refactor GetEncryptedTypes usage.

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

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase + add dcheck 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:

Index: sync/test/engine/test_directory_setter_upper.cc

diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc

index 1a683897c53b06ca32c7635c4a712b4aacb20433..318900d824bb284fc9e346b9bfa0c777ae6c3adf 100644

--- a/sync/test/engine/test_directory_setter_upper.cc

+++ b/sync/test/engine/test_directory_setter_upper.cc

@@ -23,8 +23,12 @@ TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {}

TestDirectorySetterUpper::~TestDirectorySetterUpper() {}

void TestDirectorySetterUpper::SetUp() {

- directory_.reset(new syncable::Directory(&encryptor_, &handler_, NULL,

- new syncable::InMemoryDirectoryBackingStore(name_)));

+ directory_.reset(new syncable::Directory(

+ new syncable::InMemoryDirectoryBackingStore(name_),

+ &handler_,

+ NULL,

+ &encryption_handler_,

+ encryption_handler_.cryptographer()));

ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());

ASSERT_EQ(syncable::OPENED, directory_->Open(

name_, &delegate_, NullTransactionObserver()));