| 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 509218429123dbb3220af260dceb9769c6bbd67a..065f021af8efe36e8ad9135c703fd2ef246122bd 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,10 +30,6 @@ using std::vector;
|
| BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {}
|
| BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {}
|
|
|
| -bool BuildAndProcessConflictSetsCommand::HasCustomGroupsToChange() const {
|
| - return true;
|
| -}
|
| -
|
| std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(
|
| const sessions::SyncSession& session) const {
|
| return session.GetEnabledGroupsWithConflicts();
|
|
|