Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc |
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc |
index ed6076e90aa22c79aa11f84615f3b0e81062f870..35e68eec91b68b140dd7ae8c3afc0d947bcfc320 100644 |
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc |
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc |
@@ -30,6 +30,11 @@ using std::vector; |
BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {} |
BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {} |
+std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange( |
+ const sessions::SyncSession& session) const { |
+ return GetActiveGroupsWithConflicts(session); |
+} |
+ |
void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl( |
SyncSession* session) { |
session->mutable_status_controller()->update_conflict_sets_built( |