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

content/browser/media/webrtc_getusermedia_browsertest.cc

Index: content/browser/media/webrtc_getusermedia_browsertest.cc
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
index 123c111bf43be1effa083f00da2af3a84c3bbca5..9ea10338714b0b2d440e166eeacdb1c15ac79c2c 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -83,12 +83,11 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest {
   void StartTracing() {
     CHECK(trace_log_ == NULL) << "Can only can start tracing once";
     trace_log_ = base::trace_event::TraceLog::GetInstance();
-    base::trace_event::TraceOptions trace_options(
-        base::trace_event::RECORD_UNTIL_FULL);
-    trace_options.enable_sampling = true;
-    trace_log_->SetEnabled(base::trace_event::CategoryFilter("video"),
-                           base::trace_event::TraceLog::RECORDING_MODE,
-                           trace_options);
+    base::trace_event::TraceConfig trace_config(
+        "video", base::trace_event::RECORD_UNTIL_FULL);
+    trace_config.EnableSampling();
+    trace_log_->SetEnabled(trace_config,
+                           base::trace_event::TraceLog::RECORDING_MODE);
     // Check that we are indeed recording.
     EXPECT_EQ(trace_log_->GetNumTracesRecorded(), 1);
   }