SyncSocket Transit Descriptor - refactoring

content/common/media/audio_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // IPC messages for the audio.
 // Multiply-included message file, hence no include guard.
 
 #include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
@@ skipping 21 matching lines @@
   IPC_STRUCT_MEMBER(uint32, shared_memory_count)
 IPC_STRUCT_END()
 
 // Messages sent from the browser to the renderer.
 
 // Tell the renderer process that an audio stream has been created.
 // The renderer process is given a shared memory handle for the audio data
 // 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.
 IPC_MESSAGE_CONTROL3(AudioMsg_NotifyDeviceChanged,
                      int /* stream_id */,
                      int /* new_buffer_size */,
                      int /* new_sample_rate */)
 
 // Notification message sent from AudioRendererHost to renderer for state
 // update after the renderer has requested a Create/Start/Close.
@@ skipping 54 matching lines @@
 // Set audio volume of the stream specified by stream_id.
 // TODO(hclam): change this to vector if we have channel numbers other than 2.
 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume,
                      int /* stream_id */,
                      double /* volume */)
 
 // Set audio volume of the input stream specified by stream_id.
 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,
                      int /* stream_id */,
                      double /* volume */)