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) { |