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

chrome/browser/chromeos/pulse_audio_mixer.h

 // Copyright (c) 2010 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_CHROMEOS_PULSE_AUDIO_MIXER_H_
 #define CHROME_BROWSER_CHROMEOS_PULSE_AUDIO_MIXER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 
 struct pa_context;
 struct pa_cvolume;
 struct pa_threaded_mainloop;
 struct pa_operation;
 struct pa_sink_info;
 
 namespace chromeos {
 
@@ skipping 98 matching lines @@
 
   // The PulseAudio index of the main device being used.
   int device_id_;
 
   // Set to the number of channels on the main device.
   int last_channels_;
 
   // For informational purposes only, just used to assert lock is held.
   mutable int mainloop_lock_count_;
 
-  mutable Lock mixer_state_lock_;
+  mutable base::Lock mixer_state_lock_;
   mutable State mixer_state_;
 
   // Cached contexts for use in PulseAudio calls.
   pa_context* pa_context_;
   pa_threaded_mainloop* pa_mainloop_;
 
   scoped_ptr<base::Thread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(PulseAudioMixer);
 };
 
 }  // namespace chromeos
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::PulseAudioMixer);
 
 #endif  // CHROME_BROWSER_CHROMEOS_PULSE_AUDIO_MIXER_H_