| Index: sync/sessions/ordered_commit_set.h
|
| diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
|
| index 7c1937e37ac883444d5c8b7ecef71d26f417acbb..1fe8d7c2bb62234b3c9511afbd0de4bccea8ed23 100644
|
| --- a/sync/sessions/ordered_commit_set.h
|
| +++ b/sync/sessions/ordered_commit_set.h
|
| @@ -14,7 +14,7 @@
|
| #include "sync/internal_api/public/syncable/model_type.h"
|
| #include "sync/syncable/syncable_id.h"
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
| namespace sessions {
|
|
|
| // TODO(ncarter): This code is more generic than just Commit and can
|
| @@ -30,7 +30,7 @@ class OrderedCommitSet {
|
| typedef std::vector<size_t> Projection;
|
|
|
| // TODO(chron): Reserve space according to batch size?
|
| - explicit OrderedCommitSet(const csync::ModelSafeRoutingInfo& routes);
|
| + explicit OrderedCommitSet(const syncer::ModelSafeRoutingInfo& routes);
|
| ~OrderedCommitSet();
|
|
|
| bool HaveCommitItem(const int64 metahandle) const {
|
| @@ -65,7 +65,7 @@ class OrderedCommitSet {
|
| // response one ModelSafeGroup at a time. See GetCommitIdAt for how the
|
| // indices contained in the returned Projection can be used.
|
| const Projection& GetCommitIdProjection(
|
| - csync::ModelSafeGroup group) const;
|
| + syncer::ModelSafeGroup group) const;
|
|
|
| size_t Size() const {
|
| return commit_ids_.size();
|
| @@ -89,7 +89,7 @@ class OrderedCommitSet {
|
| void operator=(const OrderedCommitSet& other);
|
| private:
|
| // A set of CommitIdProjections associated with particular ModelSafeGroups.
|
| - typedef std::map<csync::ModelSafeGroup, Projection> Projections;
|
| + typedef std::map<syncer::ModelSafeGroup, Projection> Projections;
|
|
|
| // Helper container for return value of GetCommitItemAt.
|
| struct CommitItem {
|
| @@ -115,11 +115,11 @@ class OrderedCommitSet {
|
| // and shouldn't take up too much extra space since commit lists are small.
|
| std::vector<syncable::ModelType> types_;
|
|
|
| - csync::ModelSafeRoutingInfo routes_;
|
| + syncer::ModelSafeRoutingInfo routes_;
|
| };
|
|
|
| } // namespace sessions
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|
| #endif // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_
|
|
|
|
|