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

sync/sessions/ordered_commit_set.h

 // 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.
 
 #ifndef SYNC_SESSIONS_ORDERED_COMMIT_SET_H_
 #define SYNC_SESSIONS_ORDERED_COMMIT_SET_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 20 matching lines @@
 
   // TODO(chron): Reserve space according to batch size?
   explicit OrderedCommitSet(const syncer::ModelSafeRoutingInfo& routes);
   ~OrderedCommitSet();
 
   bool HaveCommitItem(const int64 metahandle) const {
     return inserted_metahandles_.count(metahandle) > 0;
   }
 
   void AddCommitItem(const int64 metahandle, const syncable::Id& commit_id,
-                     syncable::ModelType type);
+                     syncer::ModelType type);
 
   const std::vector<syncable::Id>& GetAllCommitIds() const {
     return commit_ids_;
   }
 
   // Return the Id at index |position| in this OrderedCommitSet.  Note that
   // the index uniquely identifies the same logical item in each of:
   // 1) this OrderedCommitSet
   // 2) the CommitRequest sent to the server
   // 3) the list of EntryResponse objects in the CommitResponse.
   // These together allow re-association of the pre-commit Id with the
   // actual committed entry.
   const syncable::Id& GetCommitIdAt(const size_t position) const {
     return commit_ids_[position];
   }
 
   // Same as above, but for ModelType of the item.
-  syncable::ModelType GetModelTypeAt(const size_t position) const {
+  syncer::ModelType GetModelTypeAt(const size_t position) const {
     return types_[position];
   }
 
   // Get the projection of commit ids onto the space of commit ids
   // belonging to |group|.  This is useful when you need to process a commit
   // response one ModelSafeGroup at a time. See GetCommitIdAt for how the
   // indices contained in the returned Projection can be used.
   const Projection& GetCommitIdProjection(
       syncer::ModelSafeGroup group) const;
 
@@ skipping 18 matching lines @@
 
   void operator=(const OrderedCommitSet& other);
  private:
   // A set of CommitIdProjections associated with particular ModelSafeGroups.
   typedef std::map<syncer::ModelSafeGroup, Projection> Projections;
 
   // Helper container for return value of GetCommitItemAt.
   struct CommitItem {
     int64 meta;
     syncable::Id id;
-    syncable::ModelType group;
+    syncer::ModelType group;
   };
 
   CommitItem GetCommitItemAt(const size_t position) const;
 
   // These lists are different views of the same items; e.g they are
   // isomorphic.
   std::set<int64> inserted_metahandles_;
   std::vector<syncable::Id> commit_ids_;
   std::vector<int64> metahandle_order_;
   Projections projections_;
 
   // We need this because of operations like AppendReverse that take ids from
   // one OrderedCommitSet and insert into another -- we need to know the
   // group for each ID so that the insertion can update the appropriate
   // projection.  We could store it in commit_ids_, but sometimes we want
   // to just return the vector of Ids, so this is more straightforward
   // and shouldn't take up too much extra space since commit lists are small.
-  std::vector<syncable::ModelType> types_;
+  std::vector<syncer::ModelType> types_;
 
   syncer::ModelSafeRoutingInfo routes_;
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_