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_posix.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_posix.cc')
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 34fbca9..f1aa048 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -20,12 +20,12 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/global_descriptors_posix.h" -#include "base/lock.h" #include "base/logging.h" #include "base/process_util.h" #include "base/scoped_ptr.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/synchronization/lock.h" #include "ipc/ipc_descriptors.h" #include "ipc/ipc_switches.h" #include "ipc/file_descriptor_set_posix.h" @@ -91,7 +91,7 @@ class PipeMap { // Lookup a given channel id. Return -1 if not found. int Lookup(const std::string& channel_id) { - AutoLock locked(lock_); + base::AutoLock locked(lock_); ChannelToFDMap::const_iterator i = map_.find(channel_id); if (i == map_.end()) @@ -102,7 +102,7 @@ class PipeMap { // Remove the mapping for the given channel id. No error is signaled if the // channel_id doesn't exist void RemoveAndClose(const std::string& channel_id) { - AutoLock locked(lock_); + base::AutoLock locked(lock_); ChannelToFDMap::iterator i = map_.find(channel_id); if (i != map_.end()) { @@ -115,7 +115,7 @@ class PipeMap { // Insert a mapping from @channel_id to @fd. It's a fatal error to insert a // mapping if one already exists for the given channel_id void Insert(const std::string& channel_id, int fd) { - AutoLock locked(lock_); + base::AutoLock locked(lock_); DCHECK(fd != -1); ChannelToFDMap::const_iterator i = map_.find(channel_id); @@ -126,7 +126,7 @@ class PipeMap { } private: - Lock lock_; + base::Lock lock_; typedef std::map<std::string, int> ChannelToFDMap; ChannelToFDMap map_; |