Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / tracing_controller_android.cc

diff --git a/src/content/browser/android/tracing_controller_android.cc b/src/content/browser/android/tracing_controller_android.cc
index a9c5b40..42f4b0c 100644 (file)
--- a/src/content/browser/android/tracing_controller_android.cc
+++ b/src/content/browser/android/tracing_controller_android.cc
@@ -32,17 +32,19 @@ void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) {
 bool TracingControllerAndroid::StartTracing(JNIEnv* env,
                                             jobject obj,
                                             jstring jcategories,
-                                            jboolean record_continuously) {
+                                            jstring jtraceoptions) {
   std::string categories =
       base::android::ConvertJavaStringToUTF8(env, jcategories);
+  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(
-      categories,
-      record_continuously ? TracingController::RECORD_CONTINUOUSLY
-                          : TracingController::DEFAULT_OPTIONS,
+      base::debug::CategoryFilter(categories),
+      trace_options,
       TracingController::EnableRecordingDoneCallback());
 }