[Sync] Add auto-generated ModelType in Java.

chrome/browser/sync/profile_sync_service_android.h

Index: chrome/browser/sync/profile_sync_service_android.h
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 1de6e53857f4806f120ca27454ac2d397572797a..7253517d69390b46b148a3f839c800ecb644815b 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -142,13 +142,16 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
   // synced. Note that control types are always included here.
   // Returns a bit map of the values from
   // profile_sync_service_android.cc.
-  jlong GetActiveDataTypes(JNIEnv* env, jobject obj);
+  base::android::ScopedJavaLocalRef<jintArray> GetActiveDataTypes(JNIEnv* env,
+                                                                  jobject obj);
 
   // Get the set of preferred data types. These are the types that the user
   // has requested be synced.
   // Returns a bit map of the values from
   // profile_sync_service_android.cc.
-  jlong GetPreferredDataTypes(JNIEnv* env, jobject obj);
+  base::android::ScopedJavaLocalRef<jintArray> GetPreferredDataTypes(
+      JNIEnv* env,
+      jobject obj);
 
   // Enables the passed data types.
   // If |sync_everything| is true, then all data types are enabled and the
@@ -159,7 +162,7 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
   void SetPreferredDataTypes(JNIEnv* env,
                              jobject obj,
                              jboolean sync_everything,
-                             jlong model_type_selection);
+                             jintArray model_type_selection);
 
   // Tells sync that we're currently configuring so no data types should be
   // downloaded yet.
@@ -214,12 +217,8 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
                                        jlong network_resources);
 
   // Public for tests.
-  static jlong ModelTypeSetToSelection(syncer::ModelTypeSet model_types);
-
-  // Converts a bitmap of model types to a set of Java ModelTypes, and returns
-  // their string descriptions separated by commas.
-  static std::string ModelTypeSelectionToStringForTest(
-      jlong model_type_selection);
+  static base::android::ScopedJavaLocalRef<jintArray>
+  ModelTypeSetToJavaIntArray(JNIEnv* env, syncer::ModelTypeSet model_types);
 
   static ProfileSyncServiceAndroid* GetProfileSyncServiceAndroid();