chrome/browser/sync/glue/session_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/session_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/session_model_associator.cc

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

index 6efb3083cc4f19d2dde2d9ee79315ea12e9f6e1d..9c690d30976ab340f50b778f8235a4ece4e1cda5 100644

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

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

@@ -1595,8 +1595,7 @@ void SessionModelAssociator::BlockUntilLocalChangeForTest(

bool SessionModelAssociator::CryptoReadyIfNecessary() {

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

syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());

- const syncer::ModelTypeSet encrypted_types =

- syncer::GetEncryptedTypes(&trans);

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

return !encrypted_types.Has(SESSIONS) ||

sync_service_->IsCryptographerReady(&trans);

}