Index: content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc |
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc |
index 24881e1041286a7be1325b4ccbdac0af8a075ad2..c441897609acac36cd0a56ffa93b6a6dd1bc87bd 100644 |
--- a/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc |
+++ b/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc |
@@ -77,12 +77,13 @@ AudioInputHostMsg_CreateStream_Config DefaultConfig() { |
class MockRenderer { |
public: |
- MOCK_METHOD5(NotifyStreamCreated, |
+ MOCK_METHOD6(NotifyStreamCreated, |
void(int /*stream_id*/, |
base::SharedMemoryHandle /*handle*/, |
base::SyncSocket::TransitDescriptor /*socket_desriptor*/, |
uint32_t /*length*/, |
- uint32_t /*total_segments*/)); |
+ uint32_t /*total_segments*/, |
+ bool initially_muted)); |
MOCK_METHOD1(NotifyStreamError, void(int /*stream_id*/)); |
MOCK_METHOD0(WasShutDown, void()); |
}; |
@@ -138,7 +139,8 @@ class AudioInputRendererHostWithInterception : public AudioInputRendererHost { |
base::SharedMemoryHandle handle, |
base::SyncSocket::TransitDescriptor socket_descriptor, |
uint32_t length, |
- uint32_t total_segments) { |
+ uint32_t total_segments, |
+ bool initially_muted) { |
// It's difficult to check that the sync socket and shared memory is |
// valid in the gmock macros, so we check them here. |
EXPECT_NE(base::SyncSocket::UnwrapHandle(socket_descriptor), |
@@ -146,7 +148,7 @@ class AudioInputRendererHostWithInterception : public AudioInputRendererHost { |
base::SharedMemory memory(handle, /*read_only*/ true); |
EXPECT_TRUE(memory.Map(length)); |
renderer_->NotifyStreamCreated(stream_id, handle, socket_descriptor, length, |
- total_segments); |
+ total_segments, initially_muted); |
EXPECT_TRUE(memory.Unmap()); |
memory.Close(); |
} |
@@ -177,8 +179,8 @@ class MockAudioInputController : public AudioInputController { |
GetTaskRunnerForTesting()->PostTask( |
FROM_HERE, |
base::BindOnce(&AudioInputController::EventHandler::OnCreated, |
- base::Unretained(event_handler), |
- base::Unretained(this))); |
+ base::Unretained(event_handler), base::Unretained(this), |
+ false)); |
ON_CALL(*this, EnableDebugRecording(_)) |
.WillByDefault(SaveArg<0>(&file_name)); |
} |
@@ -334,7 +336,7 @@ TEST_F(AudioInputRendererHostTest, CreateWithDefaultDevice) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -360,7 +362,7 @@ TEST_F(AudioInputRendererHostTest, CreateWithNonDefaultDevice) { |
int session_id = Open("Nondefault device", GetRawNondefaultId()); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -376,7 +378,7 @@ TEST_F(AudioInputRendererHostTest, CreateRecordClose) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -399,7 +401,7 @@ TEST_F(AudioInputRendererHostTest, CreateSetVolumeRecordClose) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -424,7 +426,7 @@ TEST_F(AudioInputRendererHostTest, SetVolumeTooLarge_BadMessage) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -445,7 +447,7 @@ TEST_F(AudioInputRendererHostTest, SetVolumeNegative_BadMessage) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -466,7 +468,7 @@ TEST_F(AudioInputRendererHostTest, CreateTwice_Error) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(renderer_, NotifyStreamError(kStreamId)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
@@ -487,9 +489,9 @@ TEST_F(AudioInputRendererHostTest, TwoStreams) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
- EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId + 1, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
+ EXPECT_CALL(renderer_, NotifyStreamCreated(kStreamId + 1, _, _, _, |
+ kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()).Times(2); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -524,7 +526,7 @@ TEST_F(AudioInputRendererHostTest, Error_ClosesController) { |
Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |
@@ -556,7 +558,7 @@ TEST_F(AudioInputRendererHostTest, TabCaptureStream) { |
int session_id = Open("Tab capture", controls.audio.device_id); |
EXPECT_CALL(renderer_, |
- NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount)); |
+ NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount, _)); |
EXPECT_CALL(controller_factory_, ControllerCreated()); |
airh_->OnMessageReceived(AudioInputHostMsg_CreateStream( |