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

chrome/browser/android/url_utilities.cc

Index: chrome/browser/android/url_utilities.cc
diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc
index 44c4b35243d2d076afb2dfffd5504458120ae487..e9224f43ccf3fe5d1756079d339f43dfda49d9f4 100644
--- a/chrome/browser/android/url_utilities.cc
+++ b/chrome/browser/android/url_utilities.cc
@@ -43,22 +43,22 @@
                                                             filter);
 }
 
-static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(
-    JNIEnv* env,
-    jclass clazz,
-    jstring url,
-    jboolean include_private) {
+static jstring GetDomainAndRegistry(JNIEnv* env,
+                                    jclass clazz,
+                                    jstring url,
+                                    jboolean include_private) {
   DCHECK(url);
   GURL gurl = ConvertJavaStringToGURL(env, url);
   if (gurl.is_empty())
-    return ScopedJavaLocalRef<jstring>();
+    return nullptr;
 
   net::registry_controlled_domains::PrivateRegistryFilter filter =
       GetRegistryFilter(include_private);
 
+  // OK to release, JNI binding.
   return base::android::ConvertUTF8ToJavaString(
-      env,
-      net::registry_controlled_domains::GetDomainAndRegistry(gurl, filter));
+      env, net::registry_controlled_domains::GetDomainAndRegistry(
+          gurl, filter)).Release();
 }
 
 static jboolean IsGoogleSearchUrl(JNIEnv* env, jclass clazz, jstring url) {
@@ -75,10 +75,10 @@
   return google_util::IsGoogleHomePageUrl(gurl);
 }
 
-static ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env,
-                                            jclass clazz,
-                                            jstring url,
-                                            jstring optional_desired_tld) {
+static jstring FixupUrl(JNIEnv* env,
+                        jclass clazz,
+                        jstring url,
+                        jstring optional_desired_tld) {
   DCHECK(url);
   GURL fixed_url = url_formatter::FixupURL(
       base::android::ConvertJavaStringToUTF8(env, url),
@@ -86,9 +86,9 @@
           ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld)
           : std::string());
 
-  return fixed_url.is_valid()
-             ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec())
-             : ScopedJavaLocalRef<jstring>();
+  return fixed_url.is_valid() ?
+      base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() :
+      nullptr;
 }
 
 // Register native methods