| 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 d2fd74f0962558d0ace69346a395be5e01abf82c..cfa540daff5ad7c10d6db78dfca5bba55dfb8054 100644
|
| --- a/content/browser/android/tracing_controller_android.cc
|
| +++ b/content/browser/android/tracing_controller_android.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| #include "base/command_line.h"
|
| +#include "base/debug/trace_event.h"
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| #include "content/browser/tracing/trace_subscriber_stdio.h"
|
| @@ -90,6 +91,11 @@ void TracingControllerAndroid::OnTracingStopped() {
|
| subscriber_.reset();
|
| }
|
|
|
| +static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
|
| + return base::android::ConvertUTF8ToJavaString(env,
|
| + base::debug::CategoryFilter::kDefaultCategoryFilterString).Release();
|
| +}
|
| +
|
| bool RegisterTracingControllerAndroid(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|