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

Unified Diff: android/field_trial_list.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/command_line_android.cc ('k') | android/java/src/org/chromium/base/BaseChromiumApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android/field_trial_list.cc
diff --git a/android/field_trial_list.cc b/android/field_trial_list.cc
index 9cb38d2910624e7b4ce529d71503c7c935581ab2..3ff3811b0b7b730f1630dbd4162154af91b209e4 100644
--- a/android/field_trial_list.cc
+++ b/android/field_trial_list.cc
@@ -13,13 +13,12 @@
using base::android::ConvertJavaStringToUTF8;
using base::android::ConvertUTF8ToJavaString;
-static jstring FindFullName(JNIEnv* env,
- jclass clazz,
- jstring jtrial_name) {
+static ScopedJavaLocalRef<jstring> FindFullName(JNIEnv* env,
+ jclass clazz,
+ jstring jtrial_name) {
std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name));
return ConvertUTF8ToJavaString(
- env,
- base::FieldTrialList::FindFullName(trial_name)).Release();
+ env, base::FieldTrialList::FindFullName(trial_name));
}
static jboolean TrialExists(JNIEnv* env, jclass clazz, jstring jtrial_name) {
« no previous file with comments | « android/command_line_android.cc ('k') | android/java/src/org/chromium/base/BaseChromiumApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698