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