diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /ipc/ipc_channel_proxy.cc | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_proxy.cc')
| -rw-r--r-- | ipc/ipc_channel_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 6d3fdeb..5d23e7a 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -195,7 +195,7 @@ void ChannelProxy::Context::OnSendMessage(Message* message) { void ChannelProxy::Context::OnAddFilter() { std::vector<scoped_refptr<MessageFilter> > filters; { - AutoLock auto_lock(pending_filters_lock_); + base::AutoLock auto_lock(pending_filters_lock_); filters.swap(pending_filters_); } @@ -227,7 +227,7 @@ void ChannelProxy::Context::OnRemoveFilter(MessageFilter* filter) { // Called on the listener's thread void ChannelProxy::Context::AddFilter(MessageFilter* filter) { - AutoLock auto_lock(pending_filters_lock_); + base::AutoLock auto_lock(pending_filters_lock_); pending_filters_.push_back(make_scoped_refptr(filter)); ipc_message_loop_->PostTask( FROM_HERE, |