Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / tracing / tracing_messages.h

diff --git a/src/components/tracing/tracing_messages.h b/src/components/tracing/tracing_messages.h
index 1107baf..ff891a0 100644 (file)
--- a/src/components/tracing/tracing_messages.h
+++ b/src/components/tracing/tracing_messages.h
@@ -19,7 +19,7 @@
 IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing,
                      std::string /*  category_filter_str */,
                      base::TimeTicks /* browser_time */,
-                     int /* base::debug::TraceLog::Options */)
+                     std::string /* base::debug::TraceOptions */)
 
 // Sent to all child processes to disable trace event recording.
 IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
@@ -28,7 +28,7 @@ IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
 IPC_MESSAGE_CONTROL3(TracingMsg_EnableMonitoring,
                      std::string /*  category_filter_str */,
                      base::TimeTicks /* browser_time */,
-                     int /* base::debug::TraceLog::Options */)
+                     std::string /* base::debug::TraceOptions */)
 
 // Sent to all child processes to stop monitoring.
 IPC_MESSAGE_CONTROL0(TracingMsg_DisableMonitoring)
@@ -48,7 +48,7 @@ IPC_MESSAGE_CONTROL2(TracingMsg_SetWatchEvent,
 IPC_MESSAGE_CONTROL0(TracingMsg_CancelWatchEvent)
 
 // Sent everytime when a watch event is matched.
-IPC_MESSAGE_CONTROL0(TracingHostMsg_WatchEventMatched);
+IPC_MESSAGE_CONTROL0(TracingHostMsg_WatchEventMatched)
 
 // Notify the browser that this child process supports tracing.
 IPC_MESSAGE_CONTROL0(TracingHostMsg_ChildSupportsTracing)