| Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
|
| ===================================================================
|
| --- chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc (revision 112854)
|
| +++ chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc (working copy)
|
| @@ -30,11 +30,6 @@
|
| BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {}
|
| BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {}
|
|
|
| -std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(
|
| - const sessions::SyncSession& session) const {
|
| - return session.GetEnabledGroupsWithConflicts();
|
| -}
|
| -
|
| void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(
|
| SyncSession* session) {
|
| session->mutable_status_controller()->update_conflict_sets_built(
|
|
|