Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: content/browser/android/content_view_statics.cc

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e0f26a0fff88a5a85e4ed8192d10fc41d3bbaf51..6040e643442704d326feefbd925d60f59b3ebecb 100644
--- a/content/browser/android/content_view_statics.cc
+++ b/content/browser/android/content_view_statics.cc
@@ -96,12 +96,14 @@ base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher =
} // namespace
// Returns the first substring consisting of the address of a physical location.
-static jstring FindAddress(JNIEnv* env, jclass clazz, jstring addr) {
+static ScopedJavaLocalRef<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).Release();
- return NULL;
+ return ConvertUTF16ToJavaString(env, result_16);
+ return ScopedJavaLocalRef<jstring>();
}
static void SetWebKitSharedTimersSuspended(JNIEnv* env,

Powered by Google App Engine
This is Rietveld 408576698