Update from https://crrev.com/333737

shell/tracer.cc

 // Copyright 2015 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 "shell/tracer.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
+#include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
 
 namespace shell {
 
 Tracer::Tracer()
     : tracing_(false), first_chunk_written_(false), trace_file_(nullptr) {
 }
 
 Tracer::~Tracer() {
 }
 
 void Tracer::Start(const std::string& categories,
                    const std::string& duration_seconds_str,
                    const std::string& filename) {
   trace_duration_secs_ = 5;
   if (!duration_seconds_str.empty()) {
     CHECK(base::StringToInt(duration_seconds_str, &trace_duration_secs_))
         << "Could not parse --trace-startup-duration value "
         << duration_seconds_str;
   }
   tracing_ = true;
   trace_filename_ = filename;
   categories_ = categories;
-  base::trace_event::CategoryFilter category_filter(categories);
+  base::trace_event::TraceConfig config(categories,
+                                        base::trace_event::RECORD_UNTIL_FULL);
   base::trace_event::TraceLog::GetInstance()->SetEnabled(
-      category_filter, base::trace_event::TraceLog::RECORDING_MODE,
-      base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL));
+      config, base::trace_event::TraceLog::RECORDING_MODE);
 }
 
 void Tracer::DidCreateMessageLoop() {
   if (!tracing_)
     return;
 
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&shell::Tracer::StopAndFlushToFile, base::Unretained(this)),
       base::TimeDelta::FromSeconds(trace_duration_secs_));
@@ skipping 105 matching lines @@
   WriteFooterAndClose();
 }
 
 void Tracer::WriteCommaIfNeeded() {
   if (first_chunk_written_)
     PCHECK(fwrite(",", 1, 1, trace_file_) == 1);
   first_chunk_written_ = true;
 }
 
 }  // namespace shell