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

chrome/browser/sync/profile_sync_service_android.cc

Index: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index be0cb5f40c3930a15837d6c774ecd8da5ec1b0af..27f9e658fe5cd29bee7e9f95d9fbd762901a33d5 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -316,14 +316,12 @@ jboolean ProfileSyncServiceAndroid::IsSyncKeystoreMigrationDone(
 ScopedJavaLocalRef<jintArray> ProfileSyncServiceAndroid::GetActiveDataTypes(
       JNIEnv* env, jobject obj) {
   syncer::ModelTypeSet types = sync_service_->GetActiveDataTypes();
-  types.PutAll(syncer::ControlTypes());
   return ModelTypeSetToJavaIntArray(env, types);
 }
 
 ScopedJavaLocalRef<jintArray> ProfileSyncServiceAndroid::GetPreferredDataTypes(
       JNIEnv* env, jobject obj) {
   syncer::ModelTypeSet types = sync_service_->GetPreferredDataTypes();
-  types.PutAll(syncer::ControlTypes());
   return ModelTypeSetToJavaIntArray(env, types);
 }
 
@@ -338,7 +336,6 @@ void ProfileSyncServiceAndroid::SetPreferredDataTypes(
   for (size_t i = 0; i < types_vector.size(); i++) {
     types.Put(static_cast<syncer::ModelType>(types_vector[i]));
   }
-  types.RetainAll(syncer::UserSelectableTypes());
   sync_service_->OnUserChoseDatatypes(sync_everything, types);
 }