diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
| commit | 44f9c950c66c18b205f1dd56a793693899b5057a (patch) | |
| tree | 4d742f4838732d42bd7f536f8440df7aa0bbbcbf /media | |
| parent | f2bcc90abc6c33292592b17351973600b51e9b62 (diff) | |
| download | chromium_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')
| -rw-r--r-- | media/audio/audio_input_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | media/audio/audio_output_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_demuxer.h | 2 | ||||
| -rw-r--r-- | media/omx/omx_unittest.cc | 2 |
4 files changed, 4 insertions, 4 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" diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index 8187b17..e5355203 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -27,7 +27,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "media/base/buffers.h" #include "media/base/filters.h" #include "media/base/media_format.h" diff --git a/media/omx/omx_unittest.cc b/media/omx/omx_unittest.cc index 8f6e69a..18dab47 100644 --- a/media/omx/omx_unittest.cc +++ b/media/omx/omx_unittest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/openmax/il/OMX_Component.h" #include "third_party/openmax/il/OMX_Core.h" |