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

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 9522fd11152da3523a5cb28266c57de9bcb25d3d..af902af6ff7be0d173feb7c6fef5f843187e069d 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -969,9 +969,9 @@ bool SyncTest::EnableEncryption(int index) {
 
   // In order to kick off the encryption we have to reconfigure. Just grab the
   // currently synced types and use them.
-  const syncer::ModelTypeSet synced_datatypes =
-      service->GetPreferredDataTypes();
+  syncer::ModelTypeSet synced_datatypes = service->GetPreferredDataTypes();
   bool sync_everything = synced_datatypes.Equals(syncer::ModelTypeSet::All());
+  synced_datatypes.RetainAll(syncer::UserSelectableTypes());
   service->OnUserChoseDatatypes(sync_everything, synced_datatypes);
 
   return AwaitEncryptionComplete(index);