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

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 279536b09b983deec9ae5f22856e5c0bbb72f83a..10f226a3f1b0775e037700ef0e0f8eb2999c1d87 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -628,13 +628,12 @@ class ContentMainRunnerImpl : public ContentMainRunner {
     // Enable startup tracing asap to avoid early TRACE_EVENT calls being
     // ignored.
     if (command_line.HasSwitch(switches::kTraceStartup)) {
-      base::trace_event::CategoryFilter category_filter(
-          command_line.GetSwitchValueASCII(switches::kTraceStartup));
+      base::trace_event::TraceConfig trace_config(
+          command_line.GetSwitchValueASCII(switches::kTraceStartup),
+          base::trace_event::RECORD_UNTIL_FULL);
       base::trace_event::TraceLog::GetInstance()->SetEnabled(
-          category_filter,
-          base::trace_event::TraceLog::RECORDING_MODE,
-          base::trace_event::TraceOptions(
-              base::trace_event::RECORD_UNTIL_FULL));
+          trace_config,
+          base::trace_event::TraceLog::RECORDING_MODE);
     }
 #if defined(OS_WIN)
     // Enable exporting of events to ETW if requested on the command line.