summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 21:12:07 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 21:12:07 +0000
commit6d057a0cd2863c334977475881a230b210f6aa95 (patch)
treec212fb6e0cdb7fcf8d41ceb9a7217338eca5ac36 /ipc
parent4b09e654bbd742f0ec070e662de36de441e373ae (diff)
downloadchromium_src-6d057a0cd2863c334977475881a230b210f6aa95.zip
chromium_src-6d057a0cd2863c334977475881a230b210f6aa95.tar.gz
chromium_src-6d057a0cd2863c334977475881a230b210f6aa95.tar.bz2
Make utility process run in-process when running in single-process mode.
Remove the unit test/single process code path for SandboxedUnpacker as a first step. BUG=19192 R=asargent@chromium.org, scottmg@chromium.org Review URL: https://codereview.chromium.org/18119009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_channel_proxy.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index 0c8f875..45512f9 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -210,6 +210,9 @@ void ChannelProxy::Context::OnAddFilter() {
// Called on the IPC::Channel thread
void ChannelProxy::Context::OnRemoveFilter(MessageFilter* filter) {
+ if (!channel_.get())
+ return; // The filters have already been deleted.
+
for (size_t i = 0; i < filters_.size(); ++i) {
if (filters_[i].get() == filter) {
filter->OnFilterRemoved();