Index: chrome/browser/sync/engine/resolve_conflicts_command.cc |
=================================================================== |
--- chrome/browser/sync/engine/resolve_conflicts_command.cc (revision 112854) |
+++ chrome/browser/sync/engine/resolve_conflicts_command.cc (working copy) |
@@ -14,11 +14,6 @@ |
ResolveConflictsCommand::ResolveConflictsCommand() {} |
ResolveConflictsCommand::~ResolveConflictsCommand() {} |
-std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange( |
- const sessions::SyncSession& session) const { |
- return session.GetEnabledGroupsWithConflicts(); |
-} |
- |
void ResolveConflictsCommand::ModelChangingExecuteImpl( |
sessions::SyncSession* session) { |
ConflictResolver* resolver = session->context()->resolver(); |