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

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

index a7a52dd512774036911dc792f1fc57084107f10a..bb6d22858de7d41fb682893fe5cffd137cfff8cd 100644

--- a/sync/engine/get_commit_ids_command.cc

+++ b/sync/engine/get_commit_ids_command.cc

@@ -12,6 +12,7 @@

#include "sync/engine/throttled_data_type_tracker.h"

#include "sync/syncable/entry.h"

#include "sync/syncable/mutable_entry.h"

+#include "sync/syncable/nigori_handler.h"

#include "sync/syncable/nigori_util.h"

#include "sync/syncable/syncable_util.h"

#include "sync/syncable/write_transaction.h"

@@ -49,7 +50,8 @@ SyncerError GetCommitIdsCommand::ExecuteImpl(SyncSession* session) {

session->context()->

directory()->GetCryptographer(session->write_transaction());

if (cryptographer) {

- encrypted_types = cryptographer->GetEncryptedTypes();

+ encrypted_types = session->context()->directory()->GetNigoriHandler()->

+ GetEncryptedTypes(session->write_transaction());

passphrase_missing = cryptographer->has_pending_keys();

};

« no previous file with comments | « sync/engine/download_updates_command.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »