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

sync/notifier/invalidation_util.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/notifier/invalidation_util.h"
 
 #include <sstream>
 
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/v2/types.pb.h"
 
 namespace syncer {
 
 bool ObjectIdLessThan::operator()(const invalidation::ObjectId& lhs,
                                   const invalidation::ObjectId& rhs) const {
   return (lhs.source() < rhs.source()) ||
          (lhs.source() == rhs.source() && lhs.name() < rhs.name());
 }
 
-bool RealModelTypeToObjectId(syncable::ModelType model_type,
+bool RealModelTypeToObjectId(syncer::ModelType model_type,
                              invalidation::ObjectId* object_id) {
   std::string notification_type;
-  if (!syncable::RealModelTypeToNotificationType(
+  if (!syncer::RealModelTypeToNotificationType(
           model_type, &notification_type)) {
     return false;
   }
   object_id->Init(ipc::invalidation::ObjectSource::CHROME_SYNC,
                   notification_type);
   return true;
 }
 
 bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id,
-                             syncable::ModelType* model_type) {
+                             syncer::ModelType* model_type) {
   return
-      syncable::NotificationTypeToRealModelType(
+      syncer::NotificationTypeToRealModelType(
           object_id.name(), model_type);
 }
 
 std::string ObjectIdToString(
     const invalidation::ObjectId& object_id) {
   std::stringstream ss;
   ss << "{ ";
   ss << "name: " << object_id.name() << ", ";
   ss << "source: " << object_id.source();
   ss << " }";
   return ss.str();
 }
 
 std::string InvalidationToString(
     const invalidation::Invalidation& invalidation) {
   std::stringstream ss;
   ss << "{ ";
   ss << "object_id: " << ObjectIdToString(invalidation.object_id()) << ", ";
   ss << "version: " << invalidation.version();
   ss << " }";
   return ss.str();
 }
 
 }  // namespace syncer