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

sync/engine/conflict_resolver.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/conflict_resolver.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 13 matching lines @@
 using std::map;
 using std::set;
 
 namespace syncer {
 
 using sessions::ConflictProgress;
 using sessions::StatusController;
 using syncable::BaseTransaction;
 using syncable::Directory;
 using syncable::Entry;
-using syncable::GetModelTypeFromSpecifics;
 using syncable::Id;
-using syncable::IsRealDataType;
 using syncable::MutableEntry;
 using syncable::WriteTransaction;
 
 namespace {
 
 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8;
 
 }  // namespace
 
 ConflictResolver::ConflictResolver() {
@@ skipping 169 matching lines @@
             base_server_specifics.SerializeAsString();
       } else {
         decrypted_base_server_specifics = cryptographer->DecryptToString(
             base_server_specifics.encrypted());
       }
       if (decrypted_server_specifics == decrypted_base_server_specifics)
           base_server_specifics_match = true;
     }
 
     // We manually merge nigori data.
-    if (entry.GetModelType() == syncable::NIGORI) {
+    if (entry.GetModelType() == syncer::NIGORI) {
       // Create a new set of specifics based on the server specifics (which
       // preserves their encryption keys).
       sync_pb::EntitySpecifics specifics =
           entry.Get(syncable::SERVER_SPECIFICS);
       sync_pb::NigoriSpecifics* server_nigori = specifics.mutable_nigori();
       // Store the merged set of encrypted types (cryptographer->Update(..) will
       // have merged the local types already).
       cryptographer->UpdateNigoriFromEncryptedTypes(server_nigori);
       // The cryptographer has the both the local and remote encryption keys
       // (added at cryptographer->Update(..) time).
@@ skipping 174 matching lines @@
           forward_progress = true;
           break;
       }
       processed_items.insert(id);
     }
   }
   return forward_progress;
 }
 
 }  // namespace syncer