| 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 0a8cd8b3e32192c84257e4e2a79f648721f7b39a..509218429123dbb3220af260dceb9769c6bbd67a 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
|
| @@ -31,8 +31,7 @@ BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {}
|
| BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {}
|
|
|
| bool BuildAndProcessConflictSetsCommand::HasCustomGroupsToChange() const {
|
| - // TODO(akalin): Set to true.
|
| - return false;
|
| + return true;
|
| }
|
|
|
| std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(
|
|
|