| Index: content/renderer/media/audio_message_filter_unittest.cc
|
| diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc
|
| index 2ae2c3041b9e609976e720304405bf057c5a7507..e94e8cba55819f65e36f5c9e543d5dae0a8d29e9 100644
|
| --- a/content/renderer/media/audio_message_filter_unittest.cc
|
| +++ b/content/renderer/media/audio_message_filter_unittest.cc
|
| @@ -16,6 +16,7 @@ namespace content {
|
| namespace {
|
|
|
| const int kRenderFrameId = 2;
|
| +const char kEmptyMatchedDeviceId[] = "";
|
|
|
| class MockAudioDelegate : public media::AudioOutputIPCDelegate {
|
| public:
|
| @@ -28,12 +29,13 @@ class MockAudioDelegate : public media::AudioOutputIPCDelegate {
|
| state_ = state;
|
| }
|
|
|
| - void OnDeviceAuthorized(
|
| - media::OutputDeviceStatus device_status,
|
| - const media::AudioParameters& output_params) override {
|
| + void OnDeviceAuthorized(media::OutputDeviceStatus device_status,
|
| + const media::AudioParameters& output_params,
|
| + const std::string& matched_device_id) override {
|
| device_authorized_received_ = true;
|
| device_status_ = device_status;
|
| output_params_ = output_params;
|
| + matched_device_id_ = matched_device_id;
|
| }
|
|
|
| void OnStreamCreated(base::SharedMemoryHandle handle,
|
| @@ -80,6 +82,7 @@ class MockAudioDelegate : public media::AudioOutputIPCDelegate {
|
| bool device_authorized_received_;
|
| media::AudioParameters output_params_;
|
| media::OutputDeviceStatus device_status_;
|
| + std::string matched_device_id_;
|
|
|
| bool created_received_;
|
| base::SharedMemoryHandle handle_;
|
| @@ -121,7 +124,8 @@ TEST(AudioMessageFilterTest, Basic) {
|
| // AudioMsg_NotifyDeviceAuthorized
|
| EXPECT_FALSE(delegate.device_authorized_received());
|
| filter->OnMessageReceived(AudioMsg_NotifyDeviceAuthorized(
|
| - kStreamId, media::OUTPUT_DEVICE_STATUS_OK, MockOutputParams()));
|
| + kStreamId, media::OUTPUT_DEVICE_STATUS_OK, MockOutputParams(),
|
| + kEmptyMatchedDeviceId));
|
| EXPECT_TRUE(delegate.device_authorized_received());
|
| EXPECT_TRUE(delegate.output_params().Equals(MockOutputParams()));
|
| delegate.Reset();
|
|
|