From ef463a60e88172191ddb0d5a7c446f42c0dfc8da Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Fri, 27 Jul 2012 20:37:55 +0000 Subject: [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 --- sync/engine/syncer.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'sync/engine/syncer.cc') 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. -- cgit v1.1