[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

content/browser/android/tracing_controller_android.cc

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 5c14535abf5be1975c132926aa531c1172e80be3..917d1a33d26806d7ce73b0b09fff8a9e866d2531 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -35,16 +35,14 @@ bool TracingControllerAndroid::StartTracing(JNIEnv* env,
                                             jstring jtraceoptions) {
   std::string categories =
       base::android::ConvertJavaStringToUTF8(env, jcategories);
-  base::trace_event::TraceOptions trace_options;
-  trace_options.SetFromString(
-      base::android::ConvertJavaStringToUTF8(env, jtraceoptions));
+  std::string 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(
-      base::trace_event::CategoryFilter(categories),
-      trace_options,
+      base::trace_event::TraceConfig(categories, options),
       TracingController::EnableRecordingDoneCallback());
 }
 
@@ -105,9 +103,10 @@ void TracingControllerAndroid::OnKnownCategoriesReceived(
 }
 
 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
+  base::trace_event::TraceConfig trace_config;
   return base::android::ConvertUTF8ToJavaString(
              env,
-             base::trace_event::CategoryFilter::kDefaultCategoryFilterString)
+             trace_config.ToCategoryFilterString())
       .Release();
 }