diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 02:02:52 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 02:02:52 +0000 |
| commit | 3e5f5e7bc74e3323be62cd2750a051dfd9d24b46 (patch) | |
| tree | 3c3afa71929ede2107b17ac4965024afda9fa180 /sync/engine/syncer_util.cc | |
| parent | 51075f8c766f1905937845f0557342dc1da57e1f (diff) | |
| download | chromium_src-3e5f5e7bc74e3323be62cd2750a051dfd9d24b46.zip chromium_src-3e5f5e7bc74e3323be62cd2750a051dfd9d24b46.tar.gz chromium_src-3e5f5e7bc74e3323be62cd2750a051dfd9d24b46.tar.bz2 | |
Revert 167280 - [Sync] Add application logic for non-nigori control types.
We introduce logic to apply non-nigori control types. First, we iterate over
any new top level datatype entities, applying those. Then we go through the
rest of the unapplied control datatype updates, applying those. Any conflict
should be just a simple conflict, which we handle by ignoring the local
changes.
Also updates chromiumsync.py to support the new control types (and fixes
the parent folder pattern that was in use).
BUG=122825
Review URL: https://chromiumcodereview.appspot.com/11271009
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/11359175
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer_util.cc')
| -rw-r--r-- | sync/engine/syncer_util.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc index b88bc7c..cdc1b7a 100644 --- a/sync/engine/syncer_util.cc +++ b/sync/engine/syncer_util.cc @@ -209,7 +209,7 @@ UpdateAttemptResponse AttemptToUpdateEntry( // We can't decrypt this node yet. DVLOG(1) << "Received an undecryptable " << ModelTypeToString(entry->GetServerModelType()) - << " update, returning conflict_encryption."; + << " update, returning encryption_conflict."; return CONFLICT_ENCRYPTION; } else if (specifics.has_password() && entry->Get(UNIQUE_SERVER_TAG).empty()) { @@ -217,7 +217,7 @@ UpdateAttemptResponse AttemptToUpdateEntry( const sync_pb::PasswordSpecifics& password = specifics.password(); if (!cryptographer->CanDecrypt(password.encrypted())) { DVLOG(1) << "Received an undecryptable password update, returning " - << "conflict_encryption."; + << "encryption_conflict."; return CONFLICT_ENCRYPTION; } } @@ -232,7 +232,6 @@ UpdateAttemptResponse AttemptToUpdateEntry( // different ways we deal with it once here to reduce the amount of code and // potential errors. if (!parent.good() || parent.Get(IS_DEL) || !parent.Get(IS_DIR)) { - DVLOG(1) << "Entry has bad parent, returning conflict_hierarchy."; return CONFLICT_HIERARCHY; } if (entry->Get(PARENT_ID) != new_parent) { |