| Index: sync/engine/syncer.h
|
| diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
|
| index 13fc681b28fc0da0c0fdd104d1150e60adfc9cc1..52ef8bae19ad254aee657abdd10da448bed32400 100644
|
| --- a/sync/engine/syncer.h
|
| +++ b/sync/engine/syncer.h
|
| @@ -36,9 +36,7 @@ enum SyncerStep {
|
| PROCESS_UPDATES,
|
| STORE_TIMESTAMPS,
|
| APPLY_UPDATES,
|
| - BUILD_COMMIT_REQUEST,
|
| - POST_COMMIT_MESSAGE,
|
| - PROCESS_COMMIT_RESPONSE,
|
| + COMMIT,
|
| RESOLVE_CONFLICTS,
|
| APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
|
| CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'.
|
|
|