diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 19:47:48 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 19:47:48 +0000 |
| commit | 2267078cef35c04e7b2581b669d28f8d71bd54d4 (patch) | |
| tree | cb08e6c4393e72f1a2600a41673775292dfcb6a2 /media | |
| parent | 3c901ad35abdfe8bb31065b0b32c3a7343f25238 (diff) | |
| download | chromium_src-2267078cef35c04e7b2581b669d28f8d71bd54d4.zip chromium_src-2267078cef35c04e7b2581b669d28f8d71bd54d4.tar.gz chromium_src-2267078cef35c04e7b2581b669d28f8d71bd54d4.tar.bz2 | |
Minor fixes to compile media_unittests on android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9405027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/audio_low_latency_input_output_unittest.cc | 4 | ||||
| -rw-r--r-- | media/base/composite_filter_unittest.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 56e007a..cea2554 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc @@ -22,6 +22,8 @@ #include "media/audio/mac/audio_manager_mac.h" #elif defined(OS_WIN) #include "media/audio/win/audio_manager_win.h" +#elif defined(OS_ANDROID) +#include "media/audio/android/audio_manager_android.h" #endif #include "media/base/seekable_buffer.h" #include "testing/gmock/include/gmock/gmock.h" @@ -33,6 +35,8 @@ typedef AudioManagerLinux AudioManagerAnyPlatform; typedef AudioManagerMac AudioManagerAnyPlatform; #elif defined(OS_WIN) typedef AudioManagerWin AudioManagerAnyPlatform; +#elif defined(OS_ANDROID) +typedef AudioManagerAndroid AudioManagerAnyPlatform; #endif using base::win::ScopedCOMInitializer; diff --git a/media/base/composite_filter_unittest.cc b/media/base/composite_filter_unittest.cc index b5aacc4..1072fc8 100644 --- a/media/base/composite_filter_unittest.cc +++ b/media/base/composite_filter_unittest.cc @@ -400,7 +400,7 @@ TEST_F(CompositeFilterDeathTest, TestRemoveUnknownFilter) { composite_->set_host(mock_filter_host_.get()); // Remove unknown filter. scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>(); - EXPECT_DEATH(composite_->RemoveFilter(filter), ""); + EXPECT_DEATH_IF_SUPPORTED(composite_->RemoveFilter(filter), ""); } TEST_F(CompositeFilterTest, TestPlay) { |