sync/internal_api/sync_encryption_handler_impl.cc - Issue 442053002: sync: Add non-blocking type encryption (retry)

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.cc

Issue 442053002: sync: Add non-blocking type encryption (retry) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/internal_api/sync_encryption_handler_impl.cc

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

index 3a88f53710fb5e3f93ee572cf8b0a22b8acd9010..aea66e5b17b9c78c675633d6a876ea93612b2879 100644

--- a/sync/internal_api/sync_encryption_handler_impl.cc

+++ b/sync/internal_api/sync_encryption_handler_impl.cc

@@ -1519,7 +1519,7 @@ bool SyncEncryptionHandlerImpl::GetKeystoreDecryptor(

DCHECK(!keystore_key.empty());

DCHECK(cryptographer.is_ready());

std::string serialized_nigori;

- serialized_nigori = cryptographer.GetDefaultNigoriKey();

+ serialized_nigori = cryptographer.GetDefaultNigoriKeyData();

if (serialized_nigori.empty()) {

LOG(ERROR) << "Failed to get cryptographer bootstrap token.";

return false;