Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

chrome/browser/mach_broker_mac.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/mach_broker_mac.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mach_ipc_mac.h"
 #include "base/string_util.h"
@@ skipping 73 matching lines @@
       if (child_task == MACH_PORT_NULL) {
         LOG(ERROR) << "parent GetTranslatedPort(0) failed.";
         continue;
       }
 
       // It is possible for the child process to die after the call to
       // |pid_for_task()| but before the call to |FinalizePid()|.  To prevent
       // 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);
       if (err == KERN_SUCCESS) {
         broker_->FinalizePid(pid,
                              MachBroker::MachInfo().SetTask(child_task));
       } else {
         LOG(ERROR) << "Error getting pid for task " << child_task
                    << ": " << MachErrorCode(err);
       }
@@ skipping 58 matching lines @@
   }
 
   DCHECK_EQ(1, count);
   DCHECK(mach_map_[pid].mach_task_ == MACH_PORT_NULL);
   if (mach_map_[pid].mach_task_ == MACH_PORT_NULL)
     mach_map_[pid] = mach_info;
 }
 
 // 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;
 
   kern_return_t kr = mach_port_deallocate(mach_task_self(),
                                           it->second.mach_task_);
   LOG_IF(WARNING, kr != KERN_SUCCESS)
      << "Failed to mach_port_deallocate mach task " << it->second.mach_task_
      << ", error " << MachErrorCode(kr);
   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;
   return it->second.mach_task_;
 }
 
 void MachBroker::Observe(NotificationType type,
                          const NotificationSource& source,
                          const NotificationDetails& details) {
   // TODO(rohitrao): These notifications do not always carry the proper PIDs,
@@ skipping 30 matching lines @@
 #endif
       ".rohitfork.%d";
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   const bool is_child = command_line.HasSwitch(switches::kProcessType);
 
   // In non-browser (child) processes, use the parent's pid.
   const pid_t pid = is_child ? getppid() : getpid();
   return StringPrintf(kFormatString, pid);
 }