Index: media/audio/linux/audio_manager_linux.h |
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h |
index 4ae3b64294c5e0d5166b10d14c214ea4b81c59af..b657966f3fdc3eaa9232501ef7e3964071a381ef 100644 |
--- a/media/audio/linux/audio_manager_linux.h |
+++ b/media/audio/linux/audio_manager_linux.h |
@@ -7,9 +7,9 @@ |
#include <map> |
-#include "base/lock.h" |
#include "base/ref_counted.h" |
#include "base/scoped_ptr.h" |
+#include "base/synchronization/lock.h" |
#include "base/threading/thread.h" |
#include "media/audio/audio_manager_base.h" |
@@ -40,7 +40,7 @@ class AudioManagerLinux : public AudioManagerBase { |
private: |
scoped_ptr<AlsaWrapper> wrapper_; |
- Lock lock_; |
+ base::Lock lock_; |
std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> > |
active_streams_; |