Add PSS.getActiveDataTypes().

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 a8914fc0af7107c2cc72823f046f813ba7ba7450..54246052557e75b0961b9ce6149782bbd8ed27e3 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -340,13 +340,20 @@ jboolean ProfileSyncServiceAndroid::IsSyncKeystoreMigrationDone(
   return is_status_valid && !status.keystore_migration_time.is_null();
 }
 
-jlong ProfileSyncServiceAndroid::GetEnabledDataTypes(JNIEnv* env,
+jlong ProfileSyncServiceAndroid::GetActiveDataTypes(JNIEnv* env,
                                                      jobject obj) {
   syncer::ModelTypeSet types = sync_service_->GetActiveDataTypes();
   types.PutAll(syncer::ControlTypes());
   return ModelTypeSetToSelection(types);
 }
 
+jlong ProfileSyncServiceAndroid::GetPreferredDataTypes(JNIEnv* env,
+                                                     jobject obj) {

[Nicolas Zea, 2015/03/18 17:57:06]

nit: Fix indent

[maxbogue, 2015/03/18 20:51:07]

Done.

+  syncer::ModelTypeSet types = sync_service_->GetPreferredDataTypes();
+  types.PutAll(syncer::ControlTypes());

[Nicolas Zea, 2015/03/18 17:57:06]

nit: Is this necessary? Nothing outside of sync really needs to know about the
control types, we can probably leave this out.

[maxbogue, 2015/03/18 20:51:07]

This allows the control types to register for invalidations, so it is necessary.

+  return ModelTypeSetToSelection(types);
+}
+
 void ProfileSyncServiceAndroid::SetPreferredDataTypes(
     JNIEnv* env, jobject obj,
     jboolean sync_everything,