[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

1 files changed, 9 insertions, 9 deletions

diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index 19a643d..0281dcd 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -48,17 +48,17 @@ std::set<ModelSafeGroup> ComputeEnabledGroups(
   return enabled_groups;
 }
 
-void PurgeStalePayload(syncable::ModelTypePayloadMap* original,
+void PurgeStalePayload(syncer::ModelTypePayloadMap* original,
                        const ModelSafeRoutingInfo& routing_info) {
-  std::vector<syncable::ModelTypePayloadMap::iterator> iterators_to_delete;
-  for (syncable::ModelTypePayloadMap::iterator i = original->begin();
+  std::vector<syncer::ModelTypePayloadMap::iterator> iterators_to_delete;
+  for (syncer::ModelTypePayloadMap::iterator i = original->begin();
        i != original->end(); ++i) {
     if (routing_info.end() == routing_info.find(i->first)) {
       iterators_to_delete.push_back(i);
     }
   }
 
-  for (std::vector<syncable::ModelTypePayloadMap::iterator>::iterator
+  for (std::vector<syncer::ModelTypePayloadMap::iterator>::iterator
        it = iterators_to_delete.begin(); it != iterators_to_delete.end();
        ++it) {
     original->erase(*it);
@@ -156,11 +156,11 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const {
   syncable::Directory* dir = context_->directory();
 
   bool is_share_useable = true;
-  syncable::ModelTypeSet initial_sync_ended;
-  syncable::ModelTypePayloadMap download_progress_markers;
-  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    syncable::ModelType type(syncable::ModelTypeFromInt(i));
+  syncer::ModelTypeSet initial_sync_ended;
+  syncer::ModelTypePayloadMap download_progress_markers;
+  for (int i = syncer::FIRST_REAL_MODEL_TYPE;
+       i < syncer::MODEL_TYPE_COUNT; ++i) {
+    syncer::ModelType type(syncer::ModelTypeFromInt(i));
     if (routing_info_.count(type) != 0) {
       if (dir->initial_sync_ended_for_type(type))
         initial_sync_ended.Put(type);