From 1f51ad94964af7f256ac1d762a04cfac1e9935c5 Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Fri, 7 Jun 2013 02:30:24 +0000 Subject: [Sync] Allow enabling partial sets of types instead of blocking Blocking the datatype manager when datatypes fail to start is a sign of encryption issues, but is not fatal to sync. Therefore, it makes more sense to sync what we can (particularly so we can receive birthday updates), while marking those types with encryption problems as failed. To accomplish this we move all automatic reconfiguration logic into the data type manager itself, and add support for delayed association by unapplying all types with cryptographer errors. This also lays the groundwork for delayed association when a transaction version discrepancy is detected. BUG=238712 Review URL: https://chromiumcodereview.appspot.com/15013004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204695 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/internal_api/sync_encryption_handler_impl.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '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 48ad2a8..2e28e75 100644 --- a/sync/internal_api/sync_encryption_handler_impl.cc +++ b/sync/internal_api/sync_encryption_handler_impl.cc @@ -810,10 +810,8 @@ void SyncEncryptionHandlerImpl::ReEncryptEverything( continue; WriteNode child(trans); - if (child.InitByIdLookup(child_id) != BaseNode::INIT_OK) { - NOTREACHED(); - continue; - } + if (child.InitByIdLookup(child_id) != BaseNode::INIT_OK) + continue; // Possible for locally deleted items. if (child.GetIsFolder()) { to_visit.push(child.GetFirstChildId()); } -- cgit v1.1