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

Unified Diff: content/browser/android/tracing_controller_android.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/tracing_controller_android.cc
diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc
index 917d1a33d26806d7ce73b0b09fff8a9e866d2531..ac814d1f9c31df36fa36cfde6fdb16a7a1fc4c16 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -102,12 +102,11 @@ void TracingControllerAndroid::OnKnownCategoriesReceived(
LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
}
-static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
+static ScopedJavaLocalRef<jstring> GetDefaultCategories(JNIEnv* env,
+ jobject obj) {
base::trace_event::TraceConfig trace_config;
return base::android::ConvertUTF8ToJavaString(
- env,
- trace_config.ToCategoryFilterString())
- .Release();
+ env, trace_config.ToCategoryFilterString());
}
bool RegisterTracingControllerAndroid(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698