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

chrome/browser/ui/android/navigation_popup.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 "chrome/browser/ui/android/navigation_popup.h"
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 62 matching lines @@
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, navigation_entry_url.spec()));
 
   Java_NavigationPopup_onFaviconUpdated(
       env,
       obj.obj(),
       jurl.obj(),
       gfx::ConvertToJavaBitmap(image.ToSkBitmap()).obj());
 }
 
-static ScopedJavaLocalRef<jstring> GetHistoryUrl(JNIEnv* env, jclass clazz) {
-  return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL);
+static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) {
+  return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   NavigationPopup* popup = new NavigationPopup(env, obj);
   return reinterpret_cast<intptr_t>(popup);
 }
 
 // static
 bool NavigationPopup::RegisterNavigationPopup(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }