[Sync] Add auto-generated ModelType in Java.

chrome/browser/sync/profile_sync_service_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 
@@ skipping 124 matching lines @@
       GetSyncEnterCustomPassphraseBodyText(
           JNIEnv* env, jobject);
 
   // Returns true if sync has been migrated.
   jboolean IsSyncKeystoreMigrationDone(JNIEnv* env, jobject obj);
 
   // Get the set of active data types. These are the types currently being
   // 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
   // contents of |model_type_selection| is
   // ignored.
   // Otherwise, the values of |model_type_selection| must contain a bit map of
   // values from profile_sync_service_android.cc.
   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.
   void SetSetupInProgress(JNIEnv* env, jobject obj, jboolean in_progress);
 
   // Tells sync that sync setup is complete so we can start syncing now.
   void SetSyncSetupCompleted(JNIEnv* env, jobject obj);
 
   // Returns true if sync setup has been completed.
   jboolean HasSyncSetupCompleted(JNIEnv* env, jobject obj);
@@ skipping 34 matching lines @@
   // the internal value of base::Time.
   jlong GetLastSyncedTimeForTest(JNIEnv* env, jobject obj);
 
   // Overrides ProfileSyncService's NetworkResources object. This is used to
   // set up the Sync FakeServer for testing.
   void OverrideNetworkResourcesForTest(JNIEnv* env,
                                        jobject obj,
                                        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();
 
   // Registers the ProfileSyncServiceAndroid's native methods through JNI.
   static bool Register(JNIEnv* env);
 
  private:
   typedef std::map<invalidation::ObjectId,
                    int64,
                    syncer::ObjectIdLessThan> ObjectIdVersionMap;
 
   ~ProfileSyncServiceAndroid() override;
   // Remove observers to profile sync service.
   void RemoveObserver();
 
   Profile* profile_;
   ProfileSyncService* sync_service_;
   // The class that handles getting, setting, and persisting sync
   // preferences.
   scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
 
   // Java-side ProfileSyncService object.
   JavaObjectWeakGlobalRef weak_java_profile_sync_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_