Index: media/audio/audio_output_controller.h |
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h |
index 0a191e3271a8d29fd208a02b1c13639cb709d6ac..37781711cfeabbfe1123f0774c0b1a7defdd8dad 100644 |
--- a/media/audio/audio_output_controller.h |
+++ b/media/audio/audio_output_controller.h |
@@ -5,9 +5,9 @@ |
#ifndef MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_ |
#define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_ |
-#include "base/lock.h" |
#include "base/ref_counted.h" |
#include "base/scoped_ptr.h" |
+#include "base/synchronization/lock.h" |
#include "base/time.h" |
#include "media/audio/audio_buffers_state.h" |
#include "media/audio/audio_io.h" |
@@ -187,7 +187,7 @@ class AudioOutputController |
AudioBuffersState buffers_state_; |
// The |lock_| must be acquired whenever we access |buffer_|. |
- Lock lock_; |
+ base::Lock lock_; |
media::SeekableBuffer buffer_; |