[Sync] Add auto-generated ModelType in Java.

sync/test/fake_server/android/fake_server_helper_android.cc

 // Copyright 2014 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.
 
 #include "sync/test/fake_server/android/fake_server_helper_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 46 matching lines @@
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   delete fake_server_ptr;
 }
 
 jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
     JNIEnv* env,
     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);
   testing::AssertionResult result =
       fake_server_verifier.VerifyEntityCountByTypeAndName(
           count, model_type, base::android::ConvertJavaStringToUTF8(env, name));
 
   if (!result)
     LOG(WARNING) << result.message();
 
@@ skipping 22 matching lines @@
   if (!result)
     LOG(WARNING) << result.message();
 
   return result;
 }
 
 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);
 
   std::vector<std::string> entity_strings;
   for (size_t i = 0; i < entities.size(); ++i) {
     std::string s;
     entities[i].SerializeToString(&s);
     entity_strings.push_back(s);
   }
@@ skipping 164 matching lines @@
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   std::string native_id = base::android::ConvertJavaStringToUTF8(env, id);
   fake_server_ptr->InjectEntity(
       fake_server::TombstoneEntity::Create(native_id));
 }
 
 // static
 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }