SyncSocket Transit Descriptor - refactoring

content/common/media/audio_messages.h

Index: content/common/media/audio_messages.h
diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h
index 3b9bc36ce6ee3740de68cc05c07f5d0d552452e8..9a7040fe105dd06c5e4d3dbd0251bf7ea4a1bc62 100644
--- a/content/common/media/audio_messages.h
+++ b/content/common/media/audio_messages.h
@@ -39,38 +39,23 @@ IPC_STRUCT_END()
 // buffer it shares with the browser process. It is also given a SyncSocket that
 // it uses to communicate with the browser process about the state of the
 // buffered audio data.
-#if defined(OS_WIN)
-IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated,
-                     int /* stream id */,
-                     base::SharedMemoryHandle /* handle */,
-                     base::SyncSocket::Handle /* socket handle */,
-                     uint32 /* length */)
-#else
-IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated,
-                     int /* stream id */,
-                     base::SharedMemoryHandle /* handle */,
-                     base::FileDescriptor /* socket handle */,
-                     uint32 /* length */)
-#endif
+IPC_MESSAGE_CONTROL4(
+   AudioMsg_NotifyStreamCreated,
+   int /* stream id */,
+   base::SharedMemoryHandle /* handle */,
+   base::SyncSocket::TransitDescriptor /* socket descriptor */,
+   uint32 /* length */)
 
 // Tell the renderer process that an audio input stream has been created.
 // The renderer process would be given a SyncSocket that it should read
 // from from then on. It is also given number of segments in shared memory.
-#if defined(OS_WIN)
-IPC_MESSAGE_CONTROL5(AudioInputMsg_NotifyStreamCreated,
-                     int /* stream id */,
-                     base::SharedMemoryHandle /* handle */,
-                     base::SyncSocket::Handle /* socket handle */,
-                     uint32 /* length */,
-                     uint32 /* segment count */)
-#else
-IPC_MESSAGE_CONTROL5(AudioInputMsg_NotifyStreamCreated,
-                     int /* stream id */,
-                     base::SharedMemoryHandle /* handle */,
-                     base::FileDescriptor /* socket handle */,
-                     uint32 /* length */,
-                     uint32 /* segment count */)
-#endif
+IPC_MESSAGE_CONTROL5(
+   AudioInputMsg_NotifyStreamCreated,
+   int /* stream id */,
+   base::SharedMemoryHandle /* handle */,
+   base::SyncSocket::TransitDescriptor /* socket descriptor */,
+   uint32 /* length */,
+   uint32 /* segment count */)
 
 // Notification message sent from AudioRendererHost to renderer after an output
 // device change has occurred.