| 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 ac814d1f9c31df36fa36cfde6fdb16a7a1fc4c16..0aeeda7be813992aa6cd07eb68e4d1b86a21c047 100644
|
| --- a/content/browser/android/tracing_controller_android.cc
|
| +++ b/content/browser/android/tracing_controller_android.cc
|
| @@ -14,7 +14,7 @@
|
|
|
| namespace content {
|
|
|
| -static jlong Init(JNIEnv* env, jobject obj) {
|
| +static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
|
| TracingControllerAndroid* profiler = new TracingControllerAndroid(env, obj);
|
| return reinterpret_cast<intptr_t>(profiler);
|
| }
|
| @@ -102,8 +102,9 @@ void TracingControllerAndroid::OnKnownCategoriesReceived(
|
| LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetDefaultCategories(JNIEnv* env,
|
| - jobject obj) {
|
| +static ScopedJavaLocalRef<jstring> GetDefaultCategories(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& obj) {
|
| base::trace_event::TraceConfig trace_config;
|
| return base::android::ConvertUTF8ToJavaString(
|
| env, trace_config.ToCategoryFilterString());
|
|
|