Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

sync/android/model_type_helper.cc

Index: sync/android/model_type_helper.cc
diff --git a/sync/android/model_type_helper.cc b/sync/android/model_type_helper.cc
index 37650cbdf39d102912717103656e357846c34f4c..6d30eaa6d03f171807959970aa628d65f22876b9 100644
--- a/sync/android/model_type_helper.cc
+++ b/sync/android/model_type_helper.cc
@@ -11,14 +11,16 @@
 
 namespace syncer {
 
-static ScopedJavaLocalRef<jstring>
-ModelTypeToNotificationType(JNIEnv* env, jclass clazz, jint model_type_int) {
+static jstring ModelTypeToNotificationType(JNIEnv* env,
+                                           jclass clazz,
+                                           jint model_type_int) {
   std::string model_type_string;
   ModelType model_type = static_cast<ModelType>(model_type_int);
   if (!RealModelTypeToNotificationType(model_type, &model_type_string)) {
     NOTREACHED() << "No string representation of model type " << model_type;
   }
-  return base::android::ConvertUTF8ToJavaString(env, model_type_string);
+  return base::android::ConvertUTF8ToJavaString(env, model_type_string)
+      .Release();
 }
 
 bool RegisterModelTypeHelperJni(JNIEnv* env) {