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

content/browser/android/content_view_statics.cc

Index: content/browser/android/content_view_statics.cc
diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc
index 6040e643442704d326feefbd925d60f59b3ebecb..e0f26a0fff88a5a85e4ed8192d10fc41d3bbaf51 100644
--- a/content/browser/android/content_view_statics.cc
+++ b/content/browser/android/content_view_statics.cc
@@ -96,14 +96,12 @@
 }  // namespace
 
 // Returns the first substring consisting of the address of a physical location.
-static ScopedJavaLocalRef<jstring> FindAddress(JNIEnv* env,
-                                               jclass clazz,
-                                               jstring addr) {
+static jstring FindAddress(JNIEnv* env, jclass clazz, jstring addr) {
   base::string16 content_16 = ConvertJavaStringToUTF16(env, addr);
   base::string16 result_16;
   if (content::address_parser::FindAddress(content_16, &result_16))
-    return ConvertUTF16ToJavaString(env, result_16);
-  return ScopedJavaLocalRef<jstring>();
+    return ConvertUTF16ToJavaString(env, result_16).Release();
+  return NULL;
 }
 
 static void SetWebKitSharedTimersSuspended(JNIEnv* env,