SyncSocket Transit Descriptor - refactoring

content/renderer/media/audio_message_filter.cc

 // 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.
 
 #include "content/renderer/media/audio_message_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/stringprintf.h"
 #include "content/common/media/audio_messages.h"
@@ skipping 148 matching lines @@
 
   IDMap<media::AudioOutputIPCDelegate>::iterator it(&delegates_);
   while (!it.IsAtEnd()) {
     it.GetCurrentValue()->OnIPCClosed();
     delegates_.Remove(it.GetCurrentKey());
     it.Advance();
   }
 }
 
 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) {
     DLOG(WARNING) << "Got OnStreamCreated() event for a non-existent or removed"
                   << " audio renderer. (stream_id=" << stream_id << ").";
     base::SharedMemory::CloseHandle(handle);
     base::SyncSocket socket(socket_handle);
     return;
   }
   delegate->OnStreamCreated(handle, socket_handle, length);
@@ skipping 45 matching lines @@
   audio_hardware_config_->UpdateOutputConfig(output_params);
 }
 
 void AudioMessageFilter::SetAudioHardwareConfig(
     media::AudioHardwareConfig* config) {
   base::AutoLock auto_lock(lock_);
   audio_hardware_config_ = config;
 }
 
 }  // namespace content