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

sync/syncable/directory.cc

Index: sync/syncable/directory.cc
===================================================================
--- sync/syncable/directory.cc	(revision 146499)
+++ sync/syncable/directory.cc	(working copy)
@@ -577,9 +577,9 @@
   return true;
 }
 
-bool Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
+void Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
   if (types.Empty())
-    return true;
+    return;
 
   {
     WriteTransaction trans(FROM_HERE, PURGE_ENTRIES, this);
@@ -597,7 +597,7 @@
         if ((IsRealDataType(local_type) && types.Has(local_type)) ||
             (IsRealDataType(server_type) && types.Has(server_type))) {
           if (!UnlinkEntryFromOrder(*it, &trans, &lock, DATA_TYPE_PURGE))
-            return false;
+            return;
 
           int64 handle = (*it)->ref(META_HANDLE);
           kernel_->metahandles_to_purge->insert(handle);
@@ -630,7 +630,6 @@
       }
     }
   }
-  return true;
 }
 
 void Directory::HandleSaveChangesFailure(const SaveChangesSnapshot& snapshot) {