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

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/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 bool TracingControllerAndroid::StartTracing(JNIEnv* env,
                                             jobject obj,
                                             jstring jcategories,
                                             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());
 }
 
 void TracingControllerAndroid::StopTracing(JNIEnv* env,
                                            jobject obj,
                                            jstring jfilepath) {
   base::FilePath file_path(
       base::android::ConvertJavaStringToUTF8(env, jfilepath));
   if (!TracingController::GetInstance()->DisableRecording(
           TracingController::CreateFileSink(
@@ skipping 40 matching lines @@
     category_list.AppendString(*it);
   }
   std::string received_category_list;
   base::JSONWriter::Write(category_list, &received_category_list);
 
   // This log is required by adb_profile_chrome.py.
   LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
 }
 
 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();
 }
 
 bool RegisterTracingControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content