[Sync] Move ModelType and related classes to 'syncer' namespace

sync/engine/syncer_util.cc

Index: sync/engine/syncer_util.cc
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc
index 821b07c9d368cf1bf4f3535d8485ddb28bacd208..d50f4873c8a5b470b842cad4638cb01b05dd9508 100644
--- a/sync/engine/syncer_util.cc
+++ b/sync/engine/syncer_util.cc
@@ -250,7 +250,7 @@ UpdateAttemptResponse AttemptToUpdateEntry(
       !cryptographer->CanDecrypt(specifics.encrypted())) {
     // We can't decrypt this node yet.
     DVLOG(1) << "Received an undecryptable "
-             << syncable::ModelTypeToString(entry->GetServerModelType())
+             << syncer::ModelTypeToString(entry->GetServerModelType())

[rlarocque, 2012/07/03 17:51:25]

It's not necessary to explicitly specify the namespace here (or anywhere else in
this file).  

I understand that trying to remove all instances of this would be a lot of work.
 I guess we'll just leave it like this for now?

[akalin, 2012/07/03 21:47:08]

Yeah.  I'm planning to clean it all up once everything is in 'syncer'. (As then
I can just remove all instances of 'syncer::' in sync/.)

              << " update, returning encryption_conflict.";
     return CONFLICT_ENCRYPTION;
   } else if (specifics.has_password() &&
@@ -302,11 +302,11 @@ UpdateAttemptResponse AttemptToUpdateEntry(
 
   if (specifics.has_encrypted()) {
     DVLOG(2) << "Received a decryptable "
-             << syncable::ModelTypeToString(entry->GetServerModelType())
+             << syncer::ModelTypeToString(entry->GetServerModelType())
              << " update, applying normally.";
   } else {
     DVLOG(2) << "Received an unencrypted "
-             << syncable::ModelTypeToString(entry->GetServerModelType())
+             << syncer::ModelTypeToString(entry->GetServerModelType())
              << " update, applying normally.";
   }
 
@@ -386,7 +386,7 @@ void UpdateServerFieldsFromUpdate(
   }
   // Store the datatype-specific part as a protobuf.
   if (update.has_specifics()) {
-    DCHECK(update.GetModelType() != syncable::UNSPECIFIED)
+    DCHECK(update.GetModelType() != syncer::UNSPECIFIED)
         << "Storing unrecognized datatype in sync database.";
     target->Put(SERVER_SPECIFICS, update.specifics());
   } else if (update.has_bookmarkdata()) {
@@ -595,7 +595,7 @@ VerifyResult VerifyUpdateConsistency(
     syncable::MutableEntry* target,
     const bool deleted,
     const bool is_directory,
-    syncable::ModelType model_type) {
+    syncer::ModelType model_type) {
 
   CHECK(target->good());
 
@@ -603,7 +603,7 @@ VerifyResult VerifyUpdateConsistency(
   if (deleted)
     return VERIFY_SUCCESS;
 
-  if (model_type == syncable::UNSPECIFIED) {
+  if (model_type == syncer::UNSPECIFIED) {
     // This update is to an item of a datatype we don't recognize. The server
     // shouldn't have sent it to us.  Throw it on the ground.
     return VERIFY_SKIP;