Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

content/browser/android/tracing_controller_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/tracing_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
 #include "base/json/json_writer.h"
@@ skipping 14 matching lines @@
 
 TracingControllerAndroid::~TracingControllerAndroid() {}
 
 void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 bool TracingControllerAndroid::StartTracing(JNIEnv* env,
                                             jobject obj,
                                             jstring jcategories,
-                                            jboolean record_continuously) {
+                                            jstring jtraceoptions) {
   std::string categories =
       base::android::ConvertJavaStringToUTF8(env, jcategories);
+  std::string trace_options =
+      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),
+      base::debug::TraceOptions(trace_options),
       TracingController::EnableRecordingDoneCallback());
 }
 
 void TracingControllerAndroid::StopTracing(JNIEnv* env,
                                            jobject obj,
                                            jstring jfilepath) {
   base::FilePath file_path(
       base::android::ConvertJavaStringToUTF8(env, jfilepath));
   if (!TracingController::GetInstance()->DisableRecording(
       file_path,
@@ skipping 49 matching lines @@
 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
   return base::android::ConvertUTF8ToJavaString(env,
       base::debug::CategoryFilter::kDefaultCategoryFilterString).Release();
 }
 
 bool RegisterTracingControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content