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

content/common/gpu/client/gl_helper_unittest.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 <stdio.h>
 #include <cmath>
 #include <string>
 #include <vector>
 
 #include <GLES2/gl2.h>
@@ skipping 59 matching lines @@
   }
 
   void TearDown() override {
     helper_scaling_.reset(NULL);
     helper_.reset(NULL);
     context_.reset(NULL);
   }
 
   void StartTracing(const std::string& filter) {
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
-        base::trace_event::CategoryFilter(filter),
-        base::trace_event::TraceLog::RECORDING_MODE,
-        base::trace_event::TraceOptions(
-            base::trace_event::RECORD_UNTIL_FULL));
+        base::trace_event::TraceConfig(filter,
+                                       base::trace_event::RECORD_UNTIL_FULL),
+        base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   static void TraceDataCB(
       const base::Callback<void()>& callback,
       std::string* output,
       const scoped_refptr<base::RefCountedString>& json_events_str,
       bool has_more_events) {
     if (output->size() > 1 && !json_events_str->data().empty()) {
       output->append(",");
     }
@@ skipping 1891 matching lines @@
   base::TestSuite* suite = new content::ContentTestSuite(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
 
   return base::LaunchUnitTestsSerially(
     argc,
     argv,
     base::Bind(&RunHelper, base::Unretained(suite)));
 }