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

content/browser/media/webrtc_getusermedia_browsertest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "base/values.h"
@@ skipping 65 matching lines @@
 namespace content {
 
 class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest {
  public:
   WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {}
   ~WebRtcGetUserMediaBrowserTest() override {}
 
   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);
   }
 
   void StopTracing() {
     CHECK(message_loop_runner_.get() == NULL)
         << "Calling StopTracing more than once";
     trace_log_->SetDisabled();
     message_loop_runner_ = new MessageLoopRunner;
     trace_log_->Flush(base::Bind(
@@ skipping 679 matching lines @@
     {640, 640, 360, 360, 10, 30},
     {640, 640, 480, 480, 10, 30},
     {960, 960, 720, 720, 10, 30},
     {1280, 1280, 720, 720, 10, 30}};
 
 INSTANTIATE_TEST_CASE_P(UserMedia,
                         WebRtcConstraintsBrowserTest,
                         testing::ValuesIn(kAllUserMediaSizes));
 
 }  // namespace content