diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 21:22:05 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 21:22:05 +0000 |
| commit | fa4f3668bd7046b74862bc8337e82e5c164dd91d (patch) | |
| tree | 6287993868ecb3a1aba2cc927739eb7780a43a52 /sync/engine/syncer.cc | |
| parent | a7ed4b899726bb4fb7a806b9fbbb2e166c7db659 (diff) | |
| download | chromium_src-fa4f3668bd7046b74862bc8337e82e5c164dd91d.zip chromium_src-fa4f3668bd7046b74862bc8337e82e5c164dd91d.tar.gz chromium_src-fa4f3668bd7046b74862bc8337e82e5c164dd91d.tar.bz2 | |
Revert 148792 - [Sync] Remove CleanupDisabledTypes command and move purge logic into SyncManager.
We were only ever performing a meaningful cleanup on reconfigurations
or restart, so we make that explicit by purging from within the SyncManager's
loading and configuration methods.
BUG=131433, 90868
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10541079
TBR=zea@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10823061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.cc')
| -rw-r--r-- | sync/engine/syncer.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index 66afdbc..e813bc3 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -12,6 +12,7 @@ #include "build/build_config.h" #include "sync/engine/apply_updates_command.h" #include "sync/engine/build_commit_command.h" +#include "sync/engine/cleanup_disabled_types_command.h" #include "sync/engine/commit.h" #include "sync/engine/conflict_resolver.h" #include "sync/engine/download_updates_command.h" @@ -52,6 +53,7 @@ const char* SyncerStepToString(const SyncerStep step) { switch (step) { ENUM_CASE(SYNCER_BEGIN); + ENUM_CASE(CLEANUP_DISABLED_TYPES); ENUM_CASE(DOWNLOAD_UPDATES); ENUM_CASE(PROCESS_CLIENT_COMMAND); ENUM_CASE(VERIFY_UPDATES); @@ -104,8 +106,14 @@ void Syncer::SyncShare(sessions::SyncSession* session, PruneUnthrottledTypes(base::TimeTicks::Now()); session->SendEventNotification(SyncEngineEvent::SYNC_CYCLE_BEGIN); + next_step = CLEANUP_DISABLED_TYPES; + break; + case CLEANUP_DISABLED_TYPES: { + CleanupDisabledTypesCommand cleanup; + cleanup.Execute(session); next_step = DOWNLOAD_UPDATES; break; + } case DOWNLOAD_UPDATES: { // TODO(akalin): We may want to propagate this switch up // eventually. |