Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

[Android] Cherry-pick r278950 (0e40ce9) from upstream #175

Merged
merged 1 commit into from
Jul 1, 2014
Merged

[Android] Cherry-pick r278950 (0e40ce9) from upstream #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions content/child/child_thread.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,17 @@ void ChildThread::Init() {

channel_->AddFilter(histogram_message_filter_.get());
channel_->AddFilter(sync_message_filter_.get());
channel_->AddFilter(new tracing::ChildTraceMessageFilter(
ChildProcess::current()->io_message_loop_proxy()));
channel_->AddFilter(resource_message_filter_.get());
channel_->AddFilter(quota_message_filter_->GetFilter());
channel_->AddFilter(service_worker_message_filter_->GetFilter());

if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) {
// In single process mode, browser-side tracing will cover the whole
// process including renderers.
channel_->AddFilter(new tracing::ChildTraceMessageFilter(
ChildProcess::current()->io_message_loop_proxy()));
}

// In single process mode we may already have a power monitor
if (!base::PowerMonitor::Get()) {
scoped_ptr<PowerMonitorBroadcastSource> power_monitor_source(
Expand Down