Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: content/common/child_thread.cc

Issue 11411118: Add tracing support to NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove content from tracing DEPS Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/child_thread.cc
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 17e201d9fb4218790c8fda975cfe94d1d5e9df91..8b1b000eb088433784789796d4147d55afeac3cb 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -14,11 +14,11 @@
#include "content/common/child_histogram_message_filter.h"
#include "content/common/child_process.h"
#include "content/common/child_process_messages.h"
-#include "content/common/child_trace_message_filter.h"
#include "content/common/fileapi/file_system_dispatcher.h"
#include "content/common/quota_dispatcher.h"
#include "content/common/resource_dispatcher.h"
#include "content/common/socket_stream_dispatcher.h"
+#include "content/components/tracing/child_trace_message_filter.h"
#include "content/public/common/content_switches.h"
#include "ipc/ipc_logging.h"
#include "ipc/ipc_switches.h"
@@ -115,7 +115,8 @@ void ChildThread::Init() {
channel_->AddFilter(histogram_message_filter_.get());
channel_->AddFilter(sync_message_filter_.get());
- channel_->AddFilter(new ChildTraceMessageFilter());
+ channel_->AddFilter(new ChildTraceMessageFilter(
+ ChildProcess::current()->io_message_loop_proxy()));
#if defined(OS_POSIX)
// Check that --process-type is specified so we don't do this in unit tests

Powered by Google App Engine
This is Rietveld 408576698