diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:28:14 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:28:14 +0000 |
commit | a82bc78d8323e1c6f67a0dd098bf6cf58cbaf815 (patch) | |
tree | 2d9a7cb1656a653437190f5e462630618f22ec3a | |
parent | 38f61e8faa0c64a3dc7f6da443f7ece328640f4b (diff) | |
download | chromium_src-a82bc78d8323e1c6f67a0dd098bf6cf58cbaf815.zip chromium_src-a82bc78d8323e1c6f67a0dd098bf6cf58cbaf815.tar.gz chromium_src-a82bc78d8323e1c6f67a0dd098bf6cf58cbaf815.tar.bz2 |
components: Move tracing into tracing namespace.
BUG=238222
TBR=joi@chromium.org
Review URL: https://codereview.chromium.org/14813019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199627 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | components/tracing/child_trace_message_filter.cc | 6 | ||||
-rw-r--r-- | components/tracing/child_trace_message_filter.h | 4 | ||||
-rw-r--r-- | content/common/child_thread.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/plugin_main_nacl.cc | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc index c8d3147..154903a 100644 --- a/components/tracing/child_trace_message_filter.cc +++ b/components/tracing/child_trace_message_filter.cc @@ -5,12 +5,12 @@ #include "components/tracing/child_trace_message_filter.h" #include "base/debug/trace_event.h" -#include "base/message_loop_proxy.h" +#include "base/message_loop/message_loop_proxy.h" #include "components/tracing/tracing_messages.h" using base::debug::TraceLog; -namespace components { +namespace tracing { ChildTraceMessageFilter::ChildTraceMessageFilter( base::MessageLoopProxy* ipc_message_loop) @@ -115,4 +115,4 @@ void ChildTraceMessageFilter::OnTraceNotification(int notification) { channel_->Send(new TracingHostMsg_TraceNotification(notification)); } -} // namespace components +} // namespace tracing diff --git a/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h index 9f3f03a..3da936f 100644 --- a/components/tracing/child_trace_message_filter.h +++ b/components/tracing/child_trace_message_filter.h @@ -11,7 +11,7 @@ namespace base { class MessageLoopProxy; } -namespace components { +namespace tracing { // This class sends and receives trace messages on child processes. class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter { @@ -48,6 +48,6 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter { DISALLOW_COPY_AND_ASSIGN(ChildTraceMessageFilter); }; -} // namespace components +} // namespace tracing #endif // COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_ diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc index b301ab7..5cbc39f 100644 --- a/content/common/child_thread.cc +++ b/content/common/child_thread.cc @@ -122,7 +122,7 @@ void ChildThread::Init() { channel_->AddFilter(histogram_message_filter_.get()); channel_->AddFilter(sync_message_filter_.get()); - channel_->AddFilter(new components::ChildTraceMessageFilter( + channel_->AddFilter(new tracing::ChildTraceMessageFilter( ChildProcess::current()->io_message_loop_proxy())); #if defined(OS_POSIX) diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc index 90d034c..f8666ed 100644 --- a/ppapi/proxy/plugin_main_nacl.cc +++ b/ppapi/proxy/plugin_main_nacl.cc @@ -108,8 +108,7 @@ PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop) // NaCl sandbox. InitWithChannel(this, base::kNullProcessId, channel_handle, false); // Channel is server. - channel()->AddFilter( - new components::ChildTraceMessageFilter(message_loop_)); + channel()->AddFilter(new tracing::ChildTraceMessageFilter(message_loop_)); } base::MessageLoopProxy* PpapiDispatcher::GetIPCMessageLoop() { |