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

chrome/browser/mach_broker_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_MACH_BROKER_H_
 #define CHROME_BROWSER_MACH_BROKER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include <mach/mach.h>
 
-#include "base/lock.h"
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
+#include "base/synchronization/lock.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 // On OS X, the mach_port_t of a process is required to collect metrics about
 // the process. Running |task_for_pid()| is only allowed for privileged code.
 // However, a process has port rights to all its subprocesses, so let the
 // browser's child processes send their Mach port to the browser over IPC.
 // This way, the brower can at least collect metrics of its child processes,
 // which is what it's most interested in anyway.
 //
@@ skipping 35 matching lines @@
   // nothing if PlaceholderForPid() has not already been called for the given
   // |pid|.  Callers MUST acquire the lock given by GetLock() before calling
   // this method (and release the lock afterwards).
   void FinalizePid(base::ProcessHandle pid, const MachInfo& mach_info);
 
   // Removes all mappings belonging to |pid| from the broker.
   void InvalidatePid(base::ProcessHandle pid);
 
   // The lock that protects this MachBroker object.  Clients MUST acquire and
   // release this lock around calls to PlaceholderForPid() and FinalizePid().
-  Lock& GetLock();
+  base::Lock& GetLock();
 
   // Returns the Mach port name to use when sending or receiving messages.
   // Does the Right Thing in the browser and in child processes.
   static std::string GetMachPortName();
 
   // Implement |ProcessMetrics::PortProvider|.
   virtual mach_port_t TaskForPid(base::ProcessHandle process) const;
 
   // Implement |NotificationObserver|.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
  private:
   // Private constructor.
   MachBroker();
 
   // True if the listener thread has been started.
   bool listener_thread_started_;
 
   // Used to register for notifications received by NotificationObserver.
   // Accessed only on the UI thread.
   NotificationRegistrar registrar_;
 
   // Stores mach info for every process in the broker.
   typedef std::map<base::ProcessHandle, MachInfo> MachMap;
   MachMap mach_map_;
 
   // Mutex that guards |mach_map_|.
-  mutable Lock lock_;
+  mutable base::Lock lock_;
 
   friend class MachBrokerTest;
   friend class RegisterNotificationTask;
   // Needed in order to make the constructor private.
   friend struct DefaultSingletonTraits<MachBroker>;
   DISALLOW_COPY_AND_ASSIGN(MachBroker);
 };
 
 #endif  // CHROME_BROWSER_MACH_BROKER_H_