Index: chrome/browser/sync/sessions/session_state.h |
diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h |
index 85fd9a0bec3ee98ccba0ea7dcceed80d6b21bb07..99a9cb3a86de3e2c8211699ae08999bc622051d7 100644 |
--- a/chrome/browser/sync/sessions/session_state.h |
+++ b/chrome/browser/sync/sessions/session_state.h |
@@ -177,8 +177,7 @@ class ConflictProgress { |
void AddConflictingItemById(const syncable::Id& the_id); |
void EraseConflictingItemById(const syncable::Id& the_id); |
int ConflictingItemsSize() const { return conflicting_item_ids_.size(); } |
- std::set<syncable::Id>::iterator ConflictingItemsBegin(); |
- std::set<syncable::Id>::const_iterator ConflictingItemsBeginConst() const; |
+ std::set<syncable::Id>::const_iterator ConflictingItemsBegin() const; |
std::set<syncable::Id>::const_iterator ConflictingItemsEnd() const; |
// Mutators for nonblocking conflicting items (see description below). |