Index: chrome/browser/sync/engine/syncer.cc |
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc |
index dbab2fb224db32cbbf02b46e31fe1d080e43eaee..7c96cd2a5e861bd5a380071953fae8e24f3720ec 100644 |
--- a/chrome/browser/sync/engine/syncer.cc |
+++ b/chrome/browser/sync/engine/syncer.cc |
@@ -10,7 +10,6 @@ |
#include "base/message_loop.h" |
#include "base/time.h" |
#include "chrome/browser/sync/engine/apply_updates_command.h" |
-#include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" |
#include "chrome/browser/sync/engine/build_commit_command.h" |
#include "chrome/browser/sync/engine/cleanup_disabled_types_command.h" |
#include "chrome/browser/sync/engine/clear_data_command.h" |
@@ -70,7 +69,6 @@ const char* SyncerStepToString(const SyncerStep step) |
ENUM_CASE(BUILD_COMMIT_REQUEST); |
ENUM_CASE(POST_COMMIT_MESSAGE); |
ENUM_CASE(PROCESS_COMMIT_RESPONSE); |
- ENUM_CASE(BUILD_AND_PROCESS_CONFLICT_SETS); |
ENUM_CASE(RESOLVE_CONFLICTS); |
ENUM_CASE(APPLY_UPDATES_TO_RESOLVE_CONFLICTS); |
ENUM_CASE(CLEAR_PRIVATE_DATA); |
@@ -216,7 +214,7 @@ void Syncer::SyncShare(sessions::SyncSession* session, |
next_step = POST_COMMIT_MESSAGE; |
} else { |
- next_step = BUILD_AND_PROCESS_CONFLICT_SETS; |
+ next_step = RESOLVE_CONFLICTS; |
} |
break; |
@@ -234,12 +232,6 @@ void Syncer::SyncShare(sessions::SyncSession* session, |
session->mutable_status_controller()-> |
set_last_process_commit_response_result( |
process_response_command.Execute(session)); |
- next_step = BUILD_AND_PROCESS_CONFLICT_SETS; |
- break; |
- } |
- case BUILD_AND_PROCESS_CONFLICT_SETS: { |
- BuildAndProcessConflictSetsCommand build_process_conflict_sets; |
- build_process_conflict_sets.Execute(session); |
next_step = RESOLVE_CONFLICTS; |
break; |
} |