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

content/renderer/devtools/v8_sampling_profiler_browsertest.cc

 // Copyright (c) 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/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/devtools/v8_sampling_profiler.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using base::Value;
-using base::trace_event::CategoryFilter;
+using base::trace_event::TraceConfig;
 using base::trace_event::TraceLog;
-using base::trace_event::TraceOptions;
 using base::trace_event::TraceResultBuffer;
 
 namespace content {
 
 class V8SamplingProfilerTest : public RenderViewTest {
  public:
   void SetUp() override {
     RenderViewTest::SetUp();
     sampling_profiler_.reset(new V8SamplingProfiler(true));
     trace_buffer_.SetOutputCallback(json_output_.GetCallback());
@@ skipping 48 matching lines @@
 
     if (!has_more_events)
       flush_complete_event->Signal();
   }
 
   void CollectTrace(int code_added_events, int sample_events) {
     TraceLog* trace_log = TraceLog::GetInstance();
     sampling_profiler_->EnableSamplingEventForTesting(code_added_events,
                                                       sample_events);
     trace_log->SetEnabled(
-        CategoryFilter(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile")),
-        TraceLog::RECORDING_MODE, TraceOptions());
+        TraceConfig(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile"), ""),
+        TraceLog::RECORDING_MODE);
     base::RunLoop().RunUntilIdle();
     KickV8();  // Make a call to V8 so it can invoke interrupt request
                // callbacks.
     base::RunLoop().RunUntilIdle();
     sampling_profiler_->WaitSamplingEventForTesting();
     trace_log->SetDisabled();
     SyncFlush(trace_log);
   }
 
   int CountEvents(const std::string& name) const {
@@ skipping 18 matching lines @@
   base::Lock lock_;
 
   ListValue trace_parsed_;
   TraceResultBuffer trace_buffer_;
   TraceResultBuffer::SimpleOutput json_output_;
 };
 
 TEST_F(V8SamplingProfilerTest, V8SamplingEventFired) {
   sampling_profiler_->EnableSamplingEventForTesting(0, 0);
   TraceLog::GetInstance()->SetEnabled(
-      CategoryFilter(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile")),
-      TraceLog::RECORDING_MODE, TraceOptions());
+      TraceConfig(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile"), ""),
+      TraceLog::RECORDING_MODE);
   base::RunLoop().RunUntilIdle();
   sampling_profiler_->WaitSamplingEventForTesting();
   TraceLog::GetInstance()->SetDisabled();
 }
 
 TEST_F(V8SamplingProfilerTest, V8SamplingJitCodeEventsCollected) {
   CollectTrace(1, 0);
   int jit_code_added_events_count = CountEvents("JitCodeAdded");
   CHECK_LT(0, jit_code_added_events_count);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(V8SamplingProfilerTest, V8SamplingSamplesCollected) {
   CollectTrace(0, 1);
   int sample_events_count = CountEvents("V8Sample");
   CHECK_LT(0, sample_events_count);
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace content