Index: content/renderer/media/audio_message_filter.cc |
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc |
index 2f852b77446cee9dba29c118af5c59f39f6a0cda..326faca4e987c310ac3da30cf552a1a12f103c06 100644 |
--- a/content/renderer/media/audio_message_filter.cc |
+++ b/content/renderer/media/audio_message_filter.cc |
@@ -166,23 +166,16 @@ void AudioMessageFilter::OnChannelClosing() { |
} |
void AudioMessageFilter::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.
|
DCHECK(io_message_loop_->BelongsToCurrentThread()); |
WebRtcLogMessage(base::StringPrintf( |
"AMF::OnStreamCreated. stream_id=%d", |
stream_id)); |
-#if !defined(OS_WIN) |
- base::SyncSocket::Handle socket_handle = socket_descriptor.fd; |
-#endif |
+ base::SyncSocket::Handle socket_handle = |
+ base::SyncSocket::UnwrapHandle(socket_descriptor); |
media::AudioOutputIPCDelegate* delegate = delegates_.Lookup(stream_id); |
if (!delegate) { |