diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 18:14:43 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 18:14:43 +0000 |
| commit | 092ba99e28fdec0b84384e0fd59eaa3cd7b31a3b (patch) | |
| tree | a3b1992d31f2a291388b7e009afd235d144d0c8f /sync/engine/syncer.cc | |
| parent | ec06f819c6d2cbbe67821877b4b2c46f7ceb00c3 (diff) | |
| download | chromium_src-092ba99e28fdec0b84384e0fd59eaa3cd7b31a3b.zip chromium_src-092ba99e28fdec0b84384e0fd59eaa3cd7b31a3b.tar.gz chromium_src-092ba99e28fdec0b84384e0fd59eaa3cd7b31a3b.tar.bz2 | |
sync: Merge {Verify,Process}UpdatesCommand
The VerifyUpdatesCommand was used to ensure the validity of each update
that had been delivered from the server and to prepare for the
ProcessUpdatesCommand. The ProcessUpdatesCommand would then take all
updates that had been successfully verified and move them into the
SERVER_ fields of the sync directory.
It turns out that the logic can be greatly simplified by performing both
tasks within the same command. This patch does not take full advantage
of the merge. This patch is intended simply to merge the two files,
with the goal of performing more significant refactorings later.
BUG=154654
Review URL: https://chromiumcodereview.appspot.com/11091009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.cc')
| -rw-r--r-- | sync/engine/syncer.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index 7b09c3f6..ffb2fca 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -23,7 +23,6 @@ #include "sync/engine/store_timestamps_command.h" #include "sync/engine/syncer_types.h" #include "sync/engine/throttled_data_type_tracker.h" -#include "sync/engine/verify_updates_command.h" #include "sync/syncable/mutable_entry.h" #include "sync/syncable/syncable-inl.h" @@ -58,7 +57,6 @@ const char* SyncerStepToString(const SyncerStep step) switch (step) { ENUM_CASE(SYNCER_BEGIN); ENUM_CASE(DOWNLOAD_UPDATES); - ENUM_CASE(VERIFY_UPDATES); ENUM_CASE(PROCESS_UPDATES); ENUM_CASE(STORE_TIMESTAMPS); ENUM_CASE(APPLY_UPDATES); @@ -121,12 +119,6 @@ void Syncer::SyncShare(sessions::SyncSession* session, DownloadUpdatesCommand download_updates(kCreateMobileBookmarksFolder); session->mutable_status_controller()->set_last_download_updates_result( download_updates.Execute(session)); - next_step = VERIFY_UPDATES; - break; - } - case VERIFY_UPDATES: { - VerifyUpdatesCommand verify_updates; - verify_updates.Execute(session); next_step = PROCESS_UPDATES; break; } |