Index: content/browser/renderer_host/media/audio_input_renderer_host.cc |
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
index 540185dcca0b9331dbc790b57a1f9d6309088d18..0a4b01d697fc39483a9eb8e79b430960820e9c2b 100644 |
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc |
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
@@ -178,16 +178,11 @@ void AudioInputRendererHost::DoCompleteCreation( |
AudioInputSyncWriter* writer = |
static_cast<AudioInputSyncWriter*>(entry->writer.get()); |
-#if defined(OS_WIN) |
henrika (OOO until Aug 14)
2014/09/02 07:46:06
Nice to get rid of this ;-)
burnik
2014/09/02 10:02:54
:-)
On 2014/09/02 07:46:06, henrika wrote:
|
- base::SyncSocket::Handle foreign_socket_handle; |
-#else |
- base::FileDescriptor foreign_socket_handle; |
-#endif |
+ base::SyncSocket::TransitDescriptor socket_transit_descriptor; |
// If we failed to prepare the sync socket for the renderer then we fail |
// the construction of audio input stream. |
- if (!writer->PrepareForeignSocketHandle(PeerHandle(), |
- &foreign_socket_handle)) { |
+ if (!writer->PrepareForeignSocket(PeerHandle(), &socket_transit_descriptor)) { |
DeleteEntryOnError(entry, SYNC_SOCKET_ERROR); |
return; |
} |
@@ -196,8 +191,8 @@ void AudioInputRendererHost::DoCompleteCreation( |
"DoCompleteCreation => IPC channel and stream are now open", |
true); |
- Send(new AudioInputMsg_NotifyStreamCreated(entry->stream_id, |
- foreign_memory_handle, foreign_socket_handle, |
+ Send(new AudioInputMsg_NotifyStreamCreated( |
+ entry->stream_id, foreign_memory_handle, socket_transit_descriptor, |
entry->shared_memory.requested_size(), |
entry->shared_memory_segment_count)); |
} |