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

content/renderer/devtools/devtools_agent.cc

 // Copyright (c) 2012 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/renderer/devtools/devtools_agent.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 16 matching lines @@
 #endif
 
 using blink::WebConsoleMessage;
 using blink::WebDevToolsAgent;
 using blink::WebDevToolsAgentClient;
 using blink::WebLocalFrame;
 using blink::WebPoint;
 using blink::WebString;
 
 using base::trace_event::TraceLog;
-using base::trace_event::TraceOptions;
 
 namespace content {
 
 namespace {
 
 const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
 
 class WebKitClientMessageLoopImpl
     : public WebDevToolsAgentClient::WebKitClientMessageLoop {
  public:
@@ skipping 80 matching lines @@
     return;
   if (RenderWidget* widget = frame_->GetRenderWidget()) {
     widget->IgnoreAckForMouseMoveFromDebugger();
     paused_in_mouse_move_ = false;
   }
 }
 
 void DevToolsAgent::enableTracing(const WebString& category_filter) {
   TraceLog* trace_log = TraceLog::GetInstance();
   trace_log->SetEnabled(
-      base::trace_event::CategoryFilter(category_filter.utf8()),
-      TraceLog::RECORDING_MODE, TraceOptions());
+      base::trace_event::TraceConfig(category_filter.utf8(), ""),
+      TraceLog::RECORDING_MODE);
 }
 
 void DevToolsAgent::disableTracing() {
   TraceLog::GetInstance()->SetDisabled();
 }
 
 // static
 DevToolsAgent* DevToolsAgent::FromRoutingId(int routing_id) {
   IdToAgentMap::iterator it = g_agent_for_routing_id.Get().find(routing_id);
   if (it != g_agent_for_routing_id.Get().end()) {
@@ skipping 122 matching lines @@
 WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
   WebLocalFrame* web_frame = frame_->GetWebFrame();
   return web_frame ? web_frame->devToolsAgent() : nullptr;
 }
 
 bool DevToolsAgent::IsAttached() {
   return is_attached_;
 }
 
 }  // namespace content