summaryrefslogtreecommitdiffstats
path: root/media/filters/audio_renderer_base.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 04:55:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 04:55:52 +0000
commit20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch)
tree6eff1f7be4bad1a1362d3466f0ac59292dc51acc /media/filters/audio_renderer_base.h
parentc6e8346b56ab61b35845aefcf9b241c654fe1253 (diff)
downloadchromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip
chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz
chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily. BUG=none TEST=none Original review=http://codereview.chromium.org/6142009/ Patch by leviw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters/audio_renderer_base.h')
-rw-r--r--media/filters/audio_renderer_base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/audio_renderer_base.h b/media/filters/audio_renderer_base.h
index c0af81a..6c77acb 100644
--- a/media/filters/audio_renderer_base.h
+++ b/media/filters/audio_renderer_base.h
@@ -20,7 +20,7 @@
#include <deque>
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
#include "media/base/buffers.h"
#include "media/base/filters.h"
#include "media/filters/audio_renderer_algorithm_base.h"
@@ -102,7 +102,7 @@ class AudioRendererBase : public AudioRenderer {
// Algorithm for scaling audio.
scoped_ptr<AudioRendererAlgorithmBase> algorithm_;
- Lock lock_;
+ base::Lock lock_;
// Simple state tracking variable.
enum State {