| Index: sync/sessions/ordered_commit_set.cc
|
| diff --git a/sync/sessions/ordered_commit_set.cc b/sync/sessions/ordered_commit_set.cc
|
| index 06a59888ac5e8a39d302d2251ac150096e761503..f2f3755c8a3c6068016dd4dd406ddb7334cdfd30 100644
|
| --- a/sync/sessions/ordered_commit_set.cc
|
| +++ b/sync/sessions/ordered_commit_set.cc
|
| @@ -11,8 +11,7 @@
|
| namespace syncer {
|
| namespace sessions {
|
|
|
| -OrderedCommitSet::OrderedCommitSet(
|
| - const syncer::ModelSafeRoutingInfo& routes)
|
| +OrderedCommitSet::OrderedCommitSet(const ModelSafeRoutingInfo& routes)
|
| : routes_(routes) {
|
| }
|
|
|
| @@ -20,7 +19,7 @@ OrderedCommitSet::~OrderedCommitSet() {}
|
|
|
| void OrderedCommitSet::AddCommitItem(const int64 metahandle,
|
| const syncable::Id& commit_id,
|
| - syncer::ModelType type) {
|
| + ModelType type) {
|
| if (!HaveCommitItem(metahandle)) {
|
| inserted_metahandles_.insert(metahandle);
|
| metahandle_order_.push_back(metahandle);
|
| @@ -32,7 +31,7 @@ void OrderedCommitSet::AddCommitItem(const int64 metahandle,
|
| }
|
|
|
| const OrderedCommitSet::Projection& OrderedCommitSet::GetCommitIdProjection(
|
| - syncer::ModelSafeGroup group) const {
|
| + ModelSafeGroup group) const {
|
| Projections::const_iterator i = projections_.find(group);
|
| DCHECK(i != projections_.end());
|
| return i->second;
|
| @@ -99,8 +98,7 @@ OrderedCommitSet::CommitItem OrderedCommitSet::GetCommitItemAt(
|
| }
|
|
|
| bool OrderedCommitSet::HasBookmarkCommitId() const {
|
| - ModelSafeRoutingInfo::const_iterator group
|
| - = routes_.find(syncer::BOOKMARKS);
|
| + ModelSafeRoutingInfo::const_iterator group = routes_.find(BOOKMARKS);
|
| if (group == routes_.end())
|
| return false;
|
| Projections::const_iterator proj = projections_.find(group->second);
|
| @@ -108,7 +106,7 @@ bool OrderedCommitSet::HasBookmarkCommitId() const {
|
| return false;
|
| DCHECK_LE(proj->second.size(), types_.size());
|
| for (size_t i = 0; i < proj->second.size(); i++) {
|
| - if (types_[proj->second[i]] == syncer::BOOKMARKS)
|
| + if (types_[proj->second[i]] == BOOKMARKS)
|
| return true;
|
| }
|
| return false;
|
|
|