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

Unified Diff: chrome/browser/mach_broker_mac.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months 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
« no previous file with comments | « chrome/browser/mach_broker_mac.h ('k') | chrome/browser/mach_broker_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/mach_broker_mac.cc
diff --git a/chrome/browser/mach_broker_mac.cc b/chrome/browser/mach_broker_mac.cc
index 4ea20697c9c7036d39284c041cc4c8586d9df47b..03932ad29e0e648801a399aa5eadc37b67eab95e 100644
--- a/chrome/browser/mach_broker_mac.cc
+++ b/chrome/browser/mach_broker_mac.cc
@@ -91,7 +91,7 @@ class MachListenerThreadDelegate : public base::PlatformThread::Delegate {
// leaking MachBroker map entries in this case, lock around both these
// calls. If the child dies, the death notification will be processed
// after the call to FinalizePid(), ensuring proper cleanup.
- AutoLock lock(broker_->GetLock());
+ base::AutoLock lock(broker_->GetLock());
int pid;
err = pid_for_task(child_task, &pid);
@@ -170,7 +170,7 @@ void MachBroker::FinalizePid(base::ProcessHandle pid,
// Removes all mappings belonging to |pid| from the broker.
void MachBroker::InvalidatePid(base::ProcessHandle pid) {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
MachBroker::MachMap::iterator it = mach_map_.find(pid);
if (it == mach_map_.end())
return;
@@ -183,13 +183,13 @@ void MachBroker::InvalidatePid(base::ProcessHandle pid) {
mach_map_.erase(it);
}
-Lock& MachBroker::GetLock() {
+base::Lock& MachBroker::GetLock() {
return lock_;
}
// Returns the mach task belonging to |pid|.
mach_port_t MachBroker::TaskForPid(base::ProcessHandle pid) const {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
MachBroker::MachMap::const_iterator it = mach_map_.find(pid);
if (it == mach_map_.end())
return MACH_PORT_NULL;
« no previous file with comments | « chrome/browser/mach_broker_mac.h ('k') | chrome/browser/mach_broker_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698