Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
index 1ae090dfd1de8c739ab1c7a5fc1a9add5f14e305..99f130d53e104629af851cbba4484a2a13a894c9 100644 |
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
@@ -43,25 +43,9 @@ class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand { |
sessions::SyncSession* session) OVERRIDE; |
private: |
- bool BuildAndProcessConflictSets(sessions::SyncSession* session); |
- |
- bool ProcessSingleDirectionConflictSets( |
- syncable::WriteTransaction* trans, ConflictResolver* resolver, |
- Cryptographer* cryptographer, sessions::StatusController* status, |
- const ModelSafeRoutingInfo& routes); |
- bool ApplyUpdatesTransactionally( |
- syncable::WriteTransaction* trans, |
- const std::vector<syncable::Id>* const update_set, |
- ConflictResolver* resolver, |
- Cryptographer* cryptographer, |
- const ModelSafeRoutingInfo& routes, |
- sessions::StatusController* status); |
void BuildConflictSets(syncable::BaseTransaction* trans, |
sessions::ConflictProgress* conflict_progress); |
- void MergeSetsForNameClash(syncable::BaseTransaction* trans, |
- syncable::Entry* entry, |
- sessions::ConflictProgress* conflict_progress); |
void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans, |
syncable::Entry* entry, |
sessions::ConflictProgress* conflict_progress); |