[Sync] Move data type logic from PSSA to PSS.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 89499f6359fc44cafa8c96e42d428ef4f1985aee..09d4b8550ec92ee5ff43b53894cd477974181544 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1812,6 +1812,8 @@ void ProfileSyncService::OnUserChoseDatatypes(
     return;
   }
 
+  chosen_types.RetainAll(syncer::UserSelectableTypes());

[Nicolas Zea, 2015/09/16 21:30:25]

Should this be a DCHECK I wonder? If not, it would be good to understand why
OnUserChoseDatatypes is being passed non selectable types, so we can verify they
don't matter.

[maxbogue, 2015/09/18 23:47:52]

I tried converting to a DCHECK and there were lots of issues with tests. After
some investigation I think I would prefer to leave this as RetainAll for now and
do a larger inspection of all the data type methods and their relationships
later on.

+
   UpdateSelectedTypesHistogram(sync_everything, chosen_types);
   sync_prefs_.SetKeepEverythingSynced(sync_everything);
 
@@ -1844,7 +1846,8 @@ syncer::ModelTypeSet ProfileSyncService::GetActiveDataTypes() const {
 syncer::ModelTypeSet ProfileSyncService::GetPreferredDataTypes() const {
   const syncer::ModelTypeSet registered_types = GetRegisteredDataTypes();
   const syncer::ModelTypeSet preferred_types =
-      sync_prefs_.GetPreferredDataTypes(registered_types);
+      Union(sync_prefs_.GetPreferredDataTypes(registered_types),
+            syncer::ControlTypes());
   const syncer::ModelTypeSet enforced_types =
       Intersection(GetDataTypesFromPreferenceProviders(), registered_types);
   return Union(preferred_types, enforced_types);