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

Previously they were in 'syncer::syncable'.

Also remove aliases to those classes from 'syncable'.

BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,

Review URL: https://chromiumcodereview.appspot.com/10696087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 8d98646..d9fd4c5 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -155,11 +155,11 @@ class LoggingChangeDelegate : public syncer::SyncManager::ChangeDelegate {
   virtual ~LoggingChangeDelegate() {}
 
   virtual void OnChangesApplied(
-      syncable::ModelType model_type,
+      syncer::ModelType model_type,
       const syncer::BaseTransaction* trans,
       const syncer::ImmutableChangeRecordList& changes) OVERRIDE {
     LOG(INFO) << "Changes applied for "
-              << syncable::ModelTypeToString(model_type);
+              << syncer::ModelTypeToString(model_type);
     size_t i = 1;
     size_t change_count = changes.Get().size();
     for (syncer::ChangeRecordList::const_iterator it =
@@ -177,9 +177,9 @@ class LoggingChangeDelegate : public syncer::SyncManager::ChangeDelegate {
     }
   }
 
-  virtual void OnChangesComplete(syncable::ModelType model_type) OVERRIDE {
+  virtual void OnChangesComplete(syncer::ModelType model_type) OVERRIDE {
     LOG(INFO) << "Changes complete for "
-              << syncable::ModelTypeToString(model_type);
+              << syncer::ModelTypeToString(model_type);
   }
 };
 
@@ -314,9 +314,9 @@ int main(int argc, char* argv[]) {
   CHECK(database_dir.CreateUniqueTempDir());
 
   // Set up model type parameters.
-  const syncable::ModelTypeSet model_types = syncable::ModelTypeSet::All();
+  const syncer::ModelTypeSet model_types = syncer::ModelTypeSet::All();
   syncer::ModelSafeRoutingInfo routing_info;
-  for (syncable::ModelTypeSet::Iterator it = model_types.First();
+  for (syncer::ModelTypeSet::Iterator it = model_types.First();
        it.Good(); it.Inc()) {
     routing_info[it.Get()] = syncer::GROUP_PASSIVE;
   }
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 29d6edc..cab1cd6 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -62,14 +62,14 @@ class NotificationPrinter : public syncer::SyncNotifierObserver {
   }
 
   virtual void OnIncomingNotification(
-      const syncable::ModelTypePayloadMap& type_payloads,
+      const syncer::ModelTypePayloadMap& type_payloads,
       syncer::IncomingNotificationSource source) OVERRIDE {
-    for (syncable::ModelTypePayloadMap::const_iterator it =
+    for (syncer::ModelTypePayloadMap::const_iterator it =
              type_payloads.begin(); it != type_payloads.end(); ++it) {
       LOG(INFO) << (source == syncer::REMOTE_NOTIFICATION ?
                     "Remote" : "Local")
                 << " Notification: type = "
-                << syncable::ModelTypeToString(it->first)
+                << syncer::ModelTypeToString(it->first)
                 << ", payload = " << it->second;
     }
   }
@@ -242,7 +242,7 @@ int main(int argc, char* argv[]) {
   sync_notifier->SetUniqueId(kUniqueId);
   sync_notifier->UpdateCredentials(email, token);
   // Listen for notifications for all known types.
-  sync_notifier->UpdateEnabledTypes(syncable::ModelTypeSet::All());
+  sync_notifier->UpdateEnabledTypes(syncer::ModelTypeSet::All());
 
   ui_loop.Run();