chrome/browser/sync/glue/bookmark_model_associator.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: chrome/browser/sync/glue/bookmark_model_associator.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: chrome/browser/sync/glue/bookmark_model_associator.cc

diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc

index 79ae54315377884087c8a1e534c843114fc93ee0..5040400514da0d72a23753249fefd43b83d39315 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.cc

+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -664,8 +664,7 @@ bool BookmarkModelAssociator::LoadAssociations() {

bool BookmarkModelAssociator::CryptoReadyIfNecessary() {

// We only access the cryptographer while holding a transaction.

syncer::ReadTransaction trans(FROM_HERE, user_share_);

- const syncer::ModelTypeSet encrypted_types =

- syncer::GetEncryptedTypes(&trans);

+ const syncer::ModelTypeSet encrypted_types = trans.GetEncryptedTypes();

return !encrypted_types.Has(syncer::BOOKMARKS) ||

trans.GetCryptographer()->is_ready();

}