Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

sync/internal_api/public/sync_manager.h

Index: sync/internal_api/public/sync_manager.h
diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h
index bb8dd619e6a5df50d425a02cbf06c35b975a4c06..d31888c60b94cce003f7d0512d0125f39158b56b 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/sync/internal_api/public/sync_manager.h
@@ -402,6 +402,16 @@ class SyncManager {
   // Returns the set of types for which we have stored some sync data.
   syncer::ModelTypeSet InitialSyncEndedTypes();
 
+  // Returns those types within |types| that have an empty progress marker
+  // token.
+  syncer::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(

[rlarocque, 2012/07/11 22:44:42]

Does this need to be public?  Does it need to be exposed as part of
SyncManager's interface, or could it exist on SyncInternal only?

[Nicolas Zea, 2012/07/11 23:04:16]

It's primarily public for testing. Both the SyncManagerTest, and the soon to be
upgraded SyncBackendHostTests will make use of it. That, and I'd rather have it
public than have to friend random tests everytime something wants to check the
directory state. The same applies to PurgePartiallySyncedTypes.

+      syncer::ModelTypeSet types);
+
+  // Purge from the directory those types with non-empty progress markers
+  // but without initial synced ended set.
+  // Returns false if an error occurred, true otherwise.
+  bool PurgePartiallySyncedTypes();
+
   // Update tokens that we're using in Sync. Email must stay the same.
   void UpdateCredentials(const SyncCredentials& credentials);
 
@@ -560,10 +570,6 @@ class SyncManager {
 
 bool InitialSyncEndedForTypes(syncer::ModelTypeSet types, UserShare* share);
 
-syncer::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
-    syncer::ModelTypeSet types,
-    syncer::UserShare* share);
-
 const char* ConnectionStatusToString(ConnectionStatus status);
 
 // Returns the string representation of a PassphraseRequiredReason value.