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

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/i18n/icu_util.h"
@@ skipping 265 matching lines @@
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 #if defined(OS_POSIX)
   if (handle_sigterm_) {
     g_browser_process_pid = base::GetCurrentProcId();
     signal(SIGTERM, DumpStackTraceSignalHandler);
   }
 #endif  // defined(OS_POSIX)
 
   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());
   }
 
   RunTestOnMainThreadLoop();
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableTracing)) {
     base::FilePath trace_file =
         base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
             switches::kEnableTracingOutput);
@@ skipping 45 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
 }  // namespace content