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

Unified Diff: android/command_line_android.cc

Issue 2045303002: Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/domokit/base@master
Patch Set: Created 4 years, 6 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/build_info.h ('k') | android/field_trial_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android/command_line_android.cc
diff --git a/android/command_line_android.cc b/android/command_line_android.cc
index 064450dd7250dbc34d7723c5464968e0205c1ada..3a2b1f2e2af2647103386ea4ab5b1eb06ada06f0 100644
--- a/android/command_line_android.cc
+++ b/android/command_line_android.cc
@@ -40,14 +40,15 @@ static jboolean HasSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
return CommandLine::ForCurrentProcess()->HasSwitch(switch_string);
}
-static jstring GetSwitchValue(JNIEnv* env, jclass clazz, jstring jswitch) {
+static ScopedJavaLocalRef<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 0;
- // OK to release, JNI binding.
- return ConvertUTF8ToJavaString(env, value).Release();
+ return ScopedJavaLocalRef<jstring>();
+ return ConvertUTF8ToJavaString(env, value);
}
static void AppendSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
« no previous file with comments | « android/build_info.h ('k') | android/field_trial_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698