diff options
Diffstat (limited to 'chrome/browser/chromeos/audio_mixer_pulse.h')
| -rw-r--r-- | chrome/browser/chromeos/audio_mixer_pulse.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/audio_mixer_pulse.h b/chrome/browser/chromeos/audio_mixer_pulse.h index 8ce8274..4eb3f9c 100644 --- a/chrome/browser/chromeos/audio_mixer_pulse.h +++ b/chrome/browser/chromeos/audio_mixer_pulse.h @@ -8,8 +8,8 @@ #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" #include "chrome/browser/chromeos/audio_mixer.h" @@ -100,7 +100,7 @@ class AudioMixerPulse : public AudioMixer { // 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. |