SyncSocket Transit Descriptor - refactoring

content/renderer/media/audio_input_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_input_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"
 #include "content/renderer/media/webrtc_logging.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_sender.h"
 
 namespace {
 
 const int kStreamIDNotSet = -1;
 
 void LogMessage(int stream_id, const std::string& msg) {
   std::ostringstream oss;
   oss << "[stream_id=" << stream_id << "] AIMF::" << msg;
   content::WebRtcLogMessage(oss.str());
   DVLOG(1) << oss.str();
 }
 
-}
+}  // namespace
 
 namespace content {
 
 class AudioInputMessageFilter::AudioInputIPCImpl
     : public NON_EXPORTED_BASE(media::AudioInputIPC) {
  public:
   AudioInputIPCImpl(const scoped_refptr<AudioInputMessageFilter>& filter,
                     int render_view_id);
   virtual ~AudioInputIPCImpl();
 
@@ skipping 80 matching lines @@
 
   IDMap<media::AudioInputIPCDelegate>::iterator it(&delegates_);
   while (!it.IsAtEnd()) {
     it.GetCurrentValue()->OnIPCClosed();
     delegates_.Remove(it.GetCurrentKey());
     it.Advance();
   }
 }
 
 void AudioInputMessageFilter::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.

     uint32 total_segments) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   LogMessage(stream_id, "OnStreamCreated");
 
-#if !defined(OS_WIN)
-  base::SyncSocket::Handle socket_handle = socket_descriptor.fd;
-#endif
+  base::SyncSocket::Handle socket_handle =
+      base::SyncSocket::UnwrapHandle(socket_descriptor);
   media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id);
   if (!delegate) {
     DLOG(WARNING) << "Got audio stream event for a non-existent or removed"
                   << " audio capturer (stream_id=" << stream_id << ").";
     base::SharedMemory::CloseHandle(handle);
     base::SyncSocket socket(socket_handle);
     return;
   }
   // Forward message to the stream delegate.
   delegate->OnStreamCreated(handle, socket_handle, length, total_segments);
@@ skipping 73 matching lines @@
 void AudioInputMessageFilter::AudioInputIPCImpl::CloseStream() {
   DCHECK(filter_->io_message_loop_->BelongsToCurrentThread());
   DCHECK_NE(stream_id_, kStreamIDNotSet);
   LogMessage(stream_id_, "CloseStream");
   filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_));
   filter_->delegates_.Remove(stream_id_);
   stream_id_ = kStreamIDNotSet;
 }
 
 }  // namespace content