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

base/test/trace_to_file.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/test/trace_to_file.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 34 matching lines @@
 }
 
 void TraceToFile::BeginTracing(const FilePath& path,
                                const std::string& categories) {
   DCHECK(!started_);
   started_ = true;
   path_ = path;
   WriteFileHeader();
 
   trace_event::TraceLog::GetInstance()->SetEnabled(
-      trace_event::CategoryFilter(categories),
-      trace_event::TraceLog::RECORDING_MODE,
-      trace_event::TraceOptions(trace_event::RECORD_UNTIL_FULL));
+      trace_event::TraceConfig(categories, trace_event::RECORD_UNTIL_FULL),
+      trace_event::TraceLog::RECORDING_MODE);
 }
 
 void TraceToFile::WriteFileHeader() {
   const char str[] = "{\"traceEvents\": [";
   WriteFile(path_, str, static_cast<int>(strlen(str)));
 }
 
 void TraceToFile::AppendFileFooter() {
   const char str[] = "]}";
   AppendToFile(path_, str, static_cast<int>(strlen(str)));
@@ skipping 28 matching lines @@
   RunLoop run_loop;
   trace_event::TraceLog::GetInstance()->Flush(
       Bind(&OnTraceDataCollected, run_loop.QuitClosure(), Unretained(&buffer)));
   run_loop.Run();
 
   AppendFileFooter();
 }
 
 }  // namespace test
 }  // namespace base