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

sync/sessions/sync_session.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/sessions/sync_session.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 30 matching lines @@
       }
       // All enabled groups should have a corresponding worker.
       DCHECK(std::includes(
           groups_with_workers.begin(), groups_with_workers.end(),
           enabled_groups.begin(), enabled_groups.end()));
     }
   }
   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);
   }
 }
 
 }  // namesepace
 
 SyncSession::SyncSession(SyncSessionContext* context, Delegate* delegate,
     const SyncSourceInfo& source,
@@ skipping 77 matching lines @@
   finished_ = false;
   source_.updates_source =
       sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION;
   status_controller_.reset(new StatusController(routing_info_));
 }
 
 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);
       else
         is_share_useable = false;
     }
     dir->GetDownloadProgressAsString(type, &download_progress_markers[type]);
   }
 
   return SyncSessionSnapshot(
@@ skipping 95 matching lines @@
   // with the server. Therefore, we verify no errors and at least one SYNCER_OK.
   return reached_server && !HadErrors(state);
 }
 
 void SyncSession::SetFinished() {
   finished_ = true;
 }
 
 }  // namespace sessions
 }  // namespace syncer