[Sync] Convert to using auto-generated ModelType.

See http://crrev.com/1247853007 for where the new ModelType was added.

- ModelType is now just represented by an integer.
- ModelType is now located in org.chromium.sync.
- Many of the constants were singular and are now plural to match
  the ones in model_type.h.
- ModelTypeSet is removed and a jintArray is used for JNI.

BUG=509788
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1262413006

Cr-Commit-Position: refs/heads/master@{#343051}

2 files changed, 6 insertions, 17 deletions

diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/sync/test/fake_server/android/fake_server_helper_android.cc
index 40fcefd..18539ff 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -64,14 +64,9 @@ jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
     jobject obj,
     jlong fake_server,
     jlong count,
-    jstring model_type_string,
+    jint model_type_int,
     jstring name) {
-  syncer::ModelType model_type;
-  if (!NotificationTypeToRealModelType(base::android::ConvertJavaStringToUTF8(
-      env, model_type_string), &model_type)) {
-    LOG(WARNING) << "Invalid ModelType string.";
-    return false;
-  }
+  syncer::ModelType model_type = static_cast<syncer::ModelType>(model_type_int);
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   fake_server::FakeServerVerifier fake_server_verifier(fake_server_ptr);
@@ -114,17 +109,11 @@ base::android::ScopedJavaLocalRef<jobjectArray>
 FakeServerHelperAndroid::GetSyncEntitiesByModelType(JNIEnv* env,
                                                     jobject obj,
                                                     jlong fake_server,
-                                                    jstring model_type_string) {
+                                                    jint model_type_int) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
-  syncer::ModelType model_type;
-  if (!NotificationTypeToRealModelType(
-      base::android::ConvertJavaStringToUTF8(env, model_type_string),
-      &model_type)) {
-    LOG(WARNING) << "Invalid ModelType string.";
-    NOTREACHED();
-  }
+  syncer::ModelType model_type = static_cast<syncer::ModelType>(model_type_int);
 
   std::vector<sync_pb::SyncEntity> entities =
       fake_server_ptr->GetSyncEntitiesByModelType(model_type);
diff --git a/sync/test/fake_server/android/fake_server_helper_android.h b/sync/test/fake_server/android/fake_server_helper_android.h
index 98a628d..a0418ed 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.h
+++ b/sync/test/fake_server/android/fake_server_helper_android.h
@@ -38,7 +38,7 @@ class FakeServerHelperAndroid {
                                           jobject obj,
                                           jlong fake_server,
                                           jlong count,
-                                          jstring model_type_string,
+                                          jint model_type_int,
                                           jstring name);
 
   // Returns true iff |fake_server| has exactly one window of sessions with
@@ -53,7 +53,7 @@ class FakeServerHelperAndroid {
       JNIEnv* env,
       jobject obj,
       jlong fake_server,
-      jstring model_type_string);
+      jint model_type_int);
 
   // Injects a UniqueClientEntity into |fake_server|.
   void InjectUniqueClientEntity(JNIEnv* env,