summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-02-09 13:25:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 21:26:38 +0000
commit759dd8c5b9b2ece67ac0dc8e406436eff5b69d4f (patch)
treef64778060bcaa3b7aa2620850b49e01678453516 /components
parentf0a7d8ada0ddf100cd2983f0ad1d9d853115d227 (diff)
downloadchromium_src-759dd8c5b9b2ece67ac0dc8e406436eff5b69d4f.zip
chromium_src-759dd8c5b9b2ece67ac0dc8e406436eff5b69d4f.tar.gz
chromium_src-759dd8c5b9b2ece67ac0dc8e406436eff5b69d4f.tar.bz2
Mechanical rename of base::debug -> base::trace_event [final pass]
This is the last stage of the trace_event directory restructuring. This is part of a set of 3 CLs which is moving tracing clients to use the new base::trace_debug namespace. See crrev.com/837303004 and the related bug for motivations. BUG=451032 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/868603007 Cr-Commit-Position: refs/heads/master@{#315397}
Diffstat (limited to 'components')
-rw-r--r--components/feedback/tracing_manager.cc4
-rw-r--r--components/tracing/child_trace_message_filter.cc14
-rw-r--r--components/tracing/tracing_messages.h11
3 files changed, 15 insertions, 14 deletions
diff --git a/components/feedback/tracing_manager.cc b/components/feedback/tracing_manager.cc
index bd7ca79..b3ee5f4 100644
--- a/components/feedback/tracing_manager.cc
+++ b/components/feedback/tracing_manager.cc
@@ -90,8 +90,8 @@ void TracingManager::DiscardTraceData(int id) {
void TracingManager::StartTracing() {
content::TracingController::GetInstance()->EnableRecording(
- base::debug::CategoryFilter(),
- base::debug::TraceOptions(),
+ base::trace_event::CategoryFilter(),
+ base::trace_event::TraceOptions(),
content::TracingController::EnableRecordingDoneCallback());
}
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index 9663557..197d22f 100644
--- a/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -9,7 +9,7 @@
#include "components/tracing/tracing_messages.h"
#include "ipc/ipc_channel.h"
-using base::debug::TraceLog;
+using base::trace_event::TraceLog;
namespace tracing {
@@ -58,11 +58,11 @@ void ChildTraceMessageFilter::OnBeginTracing(
browser_time;
TraceLog::GetInstance()->SetTimeOffset(time_offset);
#endif
- base::debug::TraceOptions trace_options;
+ base::trace_event::TraceOptions trace_options;
trace_options.SetFromString(options);
TraceLog::GetInstance()->SetEnabled(
- base::debug::CategoryFilter(category_filter_str),
- base::debug::TraceLog::RECORDING_MODE,
+ base::trace_event::CategoryFilter(category_filter_str),
+ base::trace_event::TraceLog::RECORDING_MODE,
trace_options);
}
@@ -81,11 +81,11 @@ void ChildTraceMessageFilter::OnEnableMonitoring(
const std::string& category_filter_str,
base::TimeTicks browser_time,
const std::string& options) {
- base::debug::TraceOptions trace_options;
+ base::trace_event::TraceOptions trace_options;
trace_options.SetFromString(options);
TraceLog::GetInstance()->SetEnabled(
- base::debug::CategoryFilter(category_filter_str),
- base::debug::TraceLog::MONITORING_MODE,
+ base::trace_event::CategoryFilter(category_filter_str),
+ base::trace_event::TraceLog::MONITORING_MODE,
trace_options);
}
diff --git a/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h
index 80885a9..6cd6b27 100644
--- a/components/tracing/tracing_messages.h
+++ b/components/tracing/tracing_messages.h
@@ -16,7 +16,7 @@
#define IPC_MESSAGE_START TracingMsgStart
-IPC_STRUCT_TRAITS_BEGIN(base::debug::TraceLogStatus)
+IPC_STRUCT_TRAITS_BEGIN(base::trace_event::TraceLogStatus)
IPC_STRUCT_TRAITS_MEMBER(event_capacity)
IPC_STRUCT_TRAITS_MEMBER(event_count)
IPC_STRUCT_TRAITS_END()
@@ -25,7 +25,7 @@ IPC_STRUCT_TRAITS_END()
IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing,
std::string /* category_filter_str */,
base::TimeTicks /* browser_time */,
- std::string /* base::debug::TraceOptions */)
+ std::string /* base::trace_event::TraceOptions */)
// Sent to all child processes to disable trace event recording.
IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
@@ -34,7 +34,7 @@ IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing)
IPC_MESSAGE_CONTROL3(TracingMsg_EnableMonitoring,
std::string /* category_filter_str */,
base::TimeTicks /* browser_time */,
- std::string /* base::debug::TraceOptions */)
+ std::string /* base::trace_event::TraceOptions */)
// Sent to all child processes to stop monitoring.
IPC_MESSAGE_CONTROL0(TracingMsg_DisableMonitoring)
@@ -76,5 +76,6 @@ IPC_MESSAGE_CONTROL1(TracingHostMsg_MonitoringTraceDataCollected,
std::string /*json trace data*/)
// Reply to TracingMsg_GetTraceLogStatus.
-IPC_MESSAGE_CONTROL1(TracingHostMsg_TraceLogStatusReply,
- base::debug::TraceLogStatus /*status of the trace log*/)
+IPC_MESSAGE_CONTROL1(
+ TracingHostMsg_TraceLogStatusReply,
+ base::trace_event::TraceLogStatus /*status of the trace log*/)