Chromium Code Reviews| Index: content/renderer/media/audio_input_message_filter.cc |
| diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc |
| index 02b0b57ba8a606d0f737bf46d250d9d4e3722a4f..35b26d0f8d396692d017f4c2c8e085534f35578e 100644 |
| --- a/content/renderer/media/audio_input_message_filter.cc |
| +++ b/content/renderer/media/audio_input_message_filter.cc |
| @@ -23,7 +23,7 @@ void LogMessage(int stream_id, const std::string& msg) { |
| DVLOG(1) << oss.str(); |
| } |
| -} |
| +} // namespace |
| namespace content { |
| @@ -124,21 +124,14 @@ void AudioInputMessageFilter::OnChannelClosing() { |
| } |
| void AudioInputMessageFilter::OnStreamCreated( |
| - int stream_id, |
| - base::SharedMemoryHandle handle, |
| -#if defined(OS_WIN) |
| - base::SyncSocket::Handle socket_handle, |
| -#else |
| - base::FileDescriptor socket_descriptor, |
| -#endif |
| - uint32 length, |
| + int stream_id, base::SharedMemoryHandle handle, |
| + base::SyncSocket::TransitDescriptor socket_descriptor, uint32 length, |
|
nasko
2014/09/05 17:31:52
style: all parameters must be on their own line
burnik
2014/09/06 18:17:10
Done.
|
| uint32 total_segments) { |
| DCHECK(io_message_loop_->BelongsToCurrentThread()); |
| LogMessage(stream_id, "OnStreamCreated"); |
| -#if !defined(OS_WIN) |
| - base::SyncSocket::Handle socket_handle = socket_descriptor.fd; |
| -#endif |
| + base::SyncSocket::Handle socket_handle = |
| + base::SyncSocket::UnwrapHandle(socket_descriptor); |
| media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id); |
| if (!delegate) { |
| DLOG(WARNING) << "Got audio stream event for a non-existent or removed" |