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

chrome/browser/android/omnibox/autocomplete_controller_android.cc

Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index 3c82c97160592adf50367185411b5ade3370cec0..60b66837652aeb62650594a5c265733f1cec8562 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -521,12 +521,11 @@
   return reinterpret_cast<intptr_t>(native_bridge);
 }
 
-static ScopedJavaLocalRef<jstring> QualifyPartialURLQuery(JNIEnv* env,
-                                                          jclass clazz,
-                                                          jstring jquery) {
+static jstring QualifyPartialURLQuery(
+    JNIEnv* env, jclass clazz, jstring jquery) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   if (!profile)
-    return ScopedJavaLocalRef<jstring>();
+    return NULL;
   AutocompleteMatch match;
   base::string16 query_string(ConvertJavaStringToUTF16(env, jquery));
   AutocompleteClassifierFactory::GetForProfile(profile)->Classify(
@@ -537,16 +536,16 @@
       &match,
       NULL);
   if (!match.destination_url.is_valid())
-    return ScopedJavaLocalRef<jstring>();
+    return NULL;
 
   // Only return a URL if the match is a URL type.
   if (match.type != AutocompleteMatchType::URL_WHAT_YOU_TYPED &&
       match.type != AutocompleteMatchType::HISTORY_URL &&
       match.type != AutocompleteMatchType::NAVSUGGEST)
-    return ScopedJavaLocalRef<jstring>();
+    return NULL;
 
   // As we are returning to Java, it is fine to call Release().
-  return ConvertUTF8ToJavaString(env, match.destination_url.spec());
+  return ConvertUTF8ToJavaString(env, match.destination_url.spec()).Release();
 }
 
 static void PrefetchZeroSuggestResults(JNIEnv* env, jclass clazz) {