Index: media/audio/linux/alsa_output_unittest.cc |
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc |
index 86589961db391d8fd9b6bb19c5e0d22c2c95f6a4..adc06e40e561736184215bb736efca3d0a3d61ba 100644 |
--- a/media/audio/linux/alsa_output_unittest.cc |
+++ b/media/audio/linux/alsa_output_unittest.cc |
@@ -658,11 +658,11 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_DeviceSelect) { |
CHANNEL_LAYOUT_MONO, |
CHANNEL_LAYOUT_STEREO, |
CHANNEL_LAYOUT_SURROUND, |
- CHANNEL_LAYOUT_4POINT0, |
- CHANNEL_LAYOUT_5POINT0, |
- CHANNEL_LAYOUT_5POINT1, |
- CHANNEL_LAYOUT_7POINT0, |
- CHANNEL_LAYOUT_7POINT1 }; |
+ CHANNEL_LAYOUT_4_0, |
+ CHANNEL_LAYOUT_5_0, |
+ CHANNEL_LAYOUT_5_1, |
+ CHANNEL_LAYOUT_7_0, |
+ CHANNEL_LAYOUT_7_1 }; |
for (int i = 1; i < 9; ++i) { |
@@ -746,7 +746,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_FallbackDevices) { |
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(fourth_try.c_str()), _, _)) |
.WillOnce(Return(kTestFailedErrno)); |
- AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0); |
+ AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0); |
EXPECT_FALSE(test_stream->AutoSelectDevice(5)); |
test_stream->Close(); |
} |
@@ -765,7 +765,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_HintFail) { |
EXPECT_CALL(mock_alsa_wrapper_, StrError(kTestFailedErrno)) |
.WillOnce(Return(kDummyMessage)); |
- AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0); |
+ AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0); |
EXPECT_TRUE(test_stream->AutoSelectDevice(5)); |
EXPECT_TRUE(test_stream->should_downmix_); |
test_stream->Close(); |