Index: chrome/browser/sync/sessions/session_state.cc |
diff --git a/chrome/browser/sync/sessions/session_state.cc b/chrome/browser/sync/sessions/session_state.cc |
index f37c9f72d9788a17412fdcc12b54f65168cff7e1..5a55a928fd62e1885b4081bb54c21bfb2aae667a 100644 |
--- a/chrome/browser/sync/sessions/session_state.cc |
+++ b/chrome/browser/sync/sessions/session_state.cc |
@@ -228,12 +228,8 @@ ConflictProgress::ConflictSetsSize() const { |
return conflict_sets_.size(); |
} |
-std::set<syncable::Id>::iterator |
-ConflictProgress::ConflictingItemsBegin() { |
- return conflicting_item_ids_.begin(); |
-} |
std::set<syncable::Id>::const_iterator |
-ConflictProgress::ConflictingItemsBeginConst() const { |
+ConflictProgress::ConflictingItemsBegin() const { |
return conflicting_item_ids_.begin(); |
} |
std::set<syncable::Id>::const_iterator |