Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: sync/engine/process_updates_command.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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:
View side-by-side diff with in-line comments
Download patch
Index: sync/engine/process_updates_command.cc
diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc
index 994fe1c7f6a27deff8274af9866bbeb64e5d3072..f239a6a005a8d2b54974265ec5730ffe8903f995 100644
--- a/sync/engine/process_updates_command.cc
+++ b/sync/engine/process_updates_command.cc
@@ -77,7 +77,7 @@ bool ReverifyEntry(syncable::WriteTransaction* trans, const SyncEntity& entry,
const bool deleted = entry.has_deleted() && entry.deleted();
const bool is_directory = entry.IsFolder();
- const syncable::ModelType model_type = entry.GetModelType();
+ const syncer::ModelType model_type = entry.GetModelType();
return VERIFY_SUCCESS == VerifyUpdateConsistency(trans,
entry,
@@ -160,7 +160,7 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate(
// We only store the old specifics if they were decryptable and applied and
// there is no BASE_SERVER_SPECIFICS already. Else do nothing.
if (!target_entry.Get(syncable::IS_UNAPPLIED_UPDATE) &&
- !syncable::IsRealDataType(syncable::GetModelTypeFromSpecifics(
+ !syncer::IsRealDataType(syncer::GetModelTypeFromSpecifics(
target_entry.Get(syncable::BASE_SERVER_SPECIFICS))) &&
(!prev_specifics.has_encrypted() ||
cryptographer->CanDecrypt(prev_specifics.encrypted()))) {
@@ -168,7 +168,7 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate(
<< prev_specifics.SerializeAsString();
target_entry.Put(syncable::BASE_SERVER_SPECIFICS, prev_specifics);
}
- } else if (syncable::IsRealDataType(syncable::GetModelTypeFromSpecifics(
+ } else if (syncer::IsRealDataType(syncer::GetModelTypeFromSpecifics(
target_entry.Get(syncable::BASE_SERVER_SPECIFICS)))) {
// We have a BASE_SERVER_SPECIFICS, but a subsequent non-specifics-only
// change arrived. As a result, we can't use the specifics alone to detect
« no previous file with comments | « sync/engine/process_commit_response_command_unittest.cc ('k') | sync/engine/process_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698