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

Unified Diff: base/android/command_line_android.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « android_webview/native/cookie_manager.cc ('k') | base/android/field_trial_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/command_line_android.cc
diff --git a/base/android/command_line_android.cc b/base/android/command_line_android.cc
index 3a2b1f2e2af2647103386ea4ab5b1eb06ada06f0..064450dd7250dbc34d7723c5464968e0205c1ada 100644
--- a/base/android/command_line_android.cc
+++ b/base/android/command_line_android.cc
@@ -40,15 +40,14 @@
return CommandLine::ForCurrentProcess()->HasSwitch(switch_string);
}
-static ScopedJavaLocalRef<jstring> GetSwitchValue(JNIEnv* env,
- jclass clazz,
- jstring jswitch) {
+static jstring GetSwitchValue(JNIEnv* env, jclass clazz, jstring jswitch) {
std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
std::string value(CommandLine::ForCurrentProcess()->GetSwitchValueNative(
switch_string));
if (value.empty())
- return ScopedJavaLocalRef<jstring>();
- return ConvertUTF8ToJavaString(env, value);
+ return 0;
+ // OK to release, JNI binding.
+ return ConvertUTF8ToJavaString(env, value).Release();
}
static void AppendSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
« no previous file with comments | « android_webview/native/cookie_manager.cc ('k') | base/android/field_trial_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698