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

content/public/test/browser_test_base.cc

Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index ad9ed08c32d471120aafa5853422da796ef86b76..9892f2e3d68b823aa15d6177cc89c4a6f6c4392d 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -283,12 +283,12 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableTracing)) {
-    base::trace_event::CategoryFilter category_filter(
+    base::trace_event::TraceConfig trace_config(
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            switches::kEnableTracing));
+            switches::kEnableTracing),
+        base::trace_event::RECORD_CONTINUOUSLY);
     TracingController::GetInstance()->EnableRecording(
-        category_filter,
-        base::trace_event::TraceOptions(base::trace_event::RECORD_CONTINUOUSLY),
+        trace_config,
         TracingController::EnableRecordingDoneCallback());
   }