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

content/browser/android/content_view_statics.cc

 // Copyright (c) 2012 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 <jni.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 78 matching lines @@
 
   std::vector<int /* RenderProcessHost id */> suspended_processes_;
 };
 
 base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // 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,
                                            jclass obj,
                                            jboolean suspend) {
   if (suspend) {
     g_suspended_processes_watcher.Pointer()->SuspendWebKitSharedTimers();
   } else {
     g_suspended_processes_watcher.Pointer()->ResumeWebkitSharedTimers();
   }
 }
 
 namespace content {
 
 bool RegisterWebViewStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content