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..1c72e6f157f7936c09c52d85d4518b78b1c03044 100644
--- a/content/common/media/audio_messages.h
+++ b/content/common/media/audio_messages.h
@@ -39,38 +39,18 @@ 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 */,
+IPC_MESSAGE_CONTROL4(AudioMsg_NotifyStreamCreated, int /* stream id */,
                      base::SharedMemoryHandle /* handle */,
-                     base::FileDescriptor /* socket handle */,
+                     base::SyncSocket::TransitDescriptor /* socket handle */,

[no longer working on chromium, 2014/09/02 10:25:04]

Either change the name to TransitHandle or update the comment to socket
descriptor

[burnik, 2014/09/02 15:01:34]

Done.

                      uint32 /* length */)
-#endif
 
 // 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 */,
+IPC_MESSAGE_CONTROL5(AudioInputMsg_NotifyStreamCreated, int /* stream id */,
                      base::SharedMemoryHandle /* handle */,
-                     base::FileDescriptor /* socket handle */,
-                     uint32 /* length */,
-                     uint32 /* segment count */)
-#endif
+                     base::SyncSocket::TransitDescriptor /* socket handle */,

[no longer working on chromium, 2014/09/02 10:25:04]

ditto

[burnik, 2014/09/02 15:01:34]

Done.

+                     uint32 /* length */, uint32 /* segment count */)

[henrika (OOO until Aug 14), 2014/09/02 07:46:06]

I think these should go on one line each.

[burnik, 2014/09/02 10:02:54]

clang-format applied to all -- oops.
Done.

On 2014/09/02 07:46:06, henrika wrote:

[no longer working on chromium, 2014/09/02 10:25:04]

?? could you double check, it should be one line each.

[burnik, 2014/09/02 15:01:34]

I've ran 
git-cl-format -f master -- content/common/media/audio_messages.h
It doesn't put them on separate lines.

On 2014/09/02 10:25:04, xians1 wrote:

[no longer working on chromium, 2014/09/02 15:09:01]

The script might not be always correct, you should check the existing
audio_messages.h.

[burnik, 2014/09/04 09:04:56]

Done.

 
 // Notification message sent from AudioRendererHost to renderer after an output
 // device change has occurred.