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

components/tracing/tracing_messages.h

 // 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.
 
 // Multiply-included message header, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/sync_socket.h"
@@ skipping 14 matching lines @@
 IPC_STRUCT_TRAITS_BEGIN(base::trace_event::MemoryDumpRequestArgs)
 IPC_STRUCT_TRAITS_MEMBER(dump_guid)
 IPC_STRUCT_TRAITS_MEMBER(dump_type)
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     base::trace_event::MemoryDumpType,
     static_cast<int>(base::trace_event::MemoryDumpType::LAST))
 
 // Sent to all child processes to enable trace event recording.
-IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing,
-                     std::string /*  category_filter_str */,
-                     base::TraceTicks /* browser_time */,
-                     std::string /* base::trace_event::TraceOptions */)
+IPC_MESSAGE_CONTROL2(TracingMsg_BeginTracing,
+                     std::string /*  trace_config_str */,
+                     base::TraceTicks /* browser_time */)
 
 // Sent to all child processes to disable trace event recording.
 IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
 
 // Sent to all child processes to start monitoring.
-IPC_MESSAGE_CONTROL3(TracingMsg_EnableMonitoring,
-                     std::string /*  category_filter_str */,
-                     base::TraceTicks /* browser_time */,
-                     std::string /* base::trace_event::TraceOptions */)
+IPC_MESSAGE_CONTROL2(TracingMsg_EnableMonitoring,
+                     std::string /*  trace_config_str */,
+                     base::TraceTicks /* browser_time */)
 
 // Sent to all child processes to stop monitoring.
 IPC_MESSAGE_CONTROL0(TracingMsg_DisableMonitoring)
 
 // Sent to all child processes to capture the current monitorint snapshot.
 IPC_MESSAGE_CONTROL0(TracingMsg_CaptureMonitoringSnapshot)
 
 // Sent to all child processes to get trace buffer fullness.
 IPC_MESSAGE_CONTROL0(TracingMsg_GetTraceLogStatus)
 
@@ skipping 43 matching lines @@
     base::trace_event::TraceLogStatus /*status of the trace log*/)
 
 // Sent to the browser to initiate a global memory dump from a child process.
 IPC_MESSAGE_CONTROL1(TracingHostMsg_GlobalMemoryDumpRequest,
                      base::trace_event::MemoryDumpRequestArgs)
 
 // Reply to TracingMsg_ProcessMemoryDumpRequest.
 IPC_MESSAGE_CONTROL2(TracingHostMsg_ProcessMemoryDumpResponse,
                      uint64 /* dump_guid */,
                      bool /* success */)