| 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 f89d472d9aeb48220ff0dd3ff3ec112faee56ace..42f4b0cb12b2d0c20909b3f4e616df7d3c7386be 100644
|
| --- a/content/browser/android/tracing_controller_android.cc
|
| +++ b/content/browser/android/tracing_controller_android.cc
|
| @@ -35,15 +35,16 @@ bool TracingControllerAndroid::StartTracing(JNIEnv* env,
|
| jstring jtraceoptions) {
|
| std::string categories =
|
| base::android::ConvertJavaStringToUTF8(env, jcategories);
|
| - std::string trace_options =
|
| - base::android::ConvertJavaStringToUTF8(env, jtraceoptions);
|
| + base::debug::TraceOptions trace_options;
|
| + trace_options.SetFromString(
|
| + base::android::ConvertJavaStringToUTF8(env, jtraceoptions));
|
|
|
| // This log is required by adb_profile_chrome.py.
|
| LOG(WARNING) << "Logging performance trace to file";
|
|
|
| return TracingController::GetInstance()->EnableRecording(
|
| base::debug::CategoryFilter(categories),
|
| - base::debug::TraceOptions(trace_options),
|
| + trace_options,
|
| TracingController::EnableRecordingDoneCallback());
|
| }
|
|
|
|
|