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

chrome/test/base/tracing.cc

Index: chrome/test/base/tracing.cc
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
index 2120b9f7d852c3e252e13a9384939d0df7bd79c6..c3280ce147ee7ef2807eb771497c1bc345a21fae 100644
--- a/chrome/test/base/tracing.cc
+++ b/chrome/test/base/tracing.cc
@@ -57,8 +57,7 @@ class InProcessTraceController {
   bool BeginTracing(const std::string& category_patterns) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     return content::TracingController::GetInstance()->EnableRecording(
-        base::trace_event::CategoryFilter(category_patterns),
-        base::trace_event::TraceOptions(),
+        base::trace_event::TraceConfig(category_patterns, ""),
         content::TracingController::EnableRecordingDoneCallback());
   }
 
@@ -76,8 +75,7 @@ class InProcessTraceController {
       return false;
     }
     if (!content::TracingController::GetInstance()->EnableRecording(
-            base::trace_event::CategoryFilter(category_patterns),
-            base::trace_event::TraceOptions(),
+            base::trace_event::TraceConfig(category_patterns, ""),
             base::Bind(&InProcessTraceController::OnEnableTracingComplete,
                        base::Unretained(this)))) {
       return false;