diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 20:37:55 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 20:37:55 +0000 |
| commit | ef463a60e88172191ddb0d5a7c446f42c0dfc8da (patch) | |
| tree | 237573cf6ff4299e0848e58f1b49edf7b3306ed6 /sync/engine/syncer.cc | |
| parent | c88c900a2800546ee1a0d4f2f8e43556e73998be (diff) | |
| download | chromium_src-ef463a60e88172191ddb0d5a7c446f42c0dfc8da.zip chromium_src-ef463a60e88172191ddb0d5a7c446f42c0dfc8da.tar.gz chromium_src-ef463a60e88172191ddb0d5a7c446f42c0dfc8da.tar.bz2 | |
[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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148792 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 e813bc3..66afdbc 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -12,7 +12,6 @@ #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" @@ -53,7 +52,6 @@ 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); @@ -106,14 +104,8 @@ 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. |