summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-02 06:05:39 +0000
commit44f9c950c66c18b205f1dd56a793693899b5057a (patch)
tree4d742f4838732d42bd7f536f8440df7aa0bbbcbf /media/audio
parentf2bcc90abc6c33292592b17351973600b51e9b62 (diff)
downloadchromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.zip
chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.gz
chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.bz2
Move CancellationFlag and WaitableEvent to the synchronization subdirectory.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/5977010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/audio_input_controller_unittest.cc2
-rw-r--r--media/audio/audio_output_controller_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index ac57d2a..b6efe96 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/basictypes.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "media/audio/audio_input_controller.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index d70aed1..2cf936b 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/task.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
#include "media/audio/audio_output_controller.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"