POSIX: Clean up DescriptorSet

chrome/common/ipc_message.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_COMMON_IPC_MESSAGE_H__
 #define CHROME_COMMON_IPC_MESSAGE_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 #if defined(OS_WIN)
 // TODO(port): IPC message logging hasn't been ported to other platforms yet.
 #ifndef NDEBUG
 #define IPC_MESSAGE_LOG_ENABLED
 #endif
 #elif defined(OS_POSIX)
-#include "chrome/common/descriptor_set_posix.h"
+#include "base/ref_counted.h"
 #endif
 
+namespace base {
+class FileDescriptor;
+}
+
+class DescriptorSet;
+
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
 class Channel;
 class Message;
 struct LogData;
 
 class Message : public Pickle {
  public:
@@ skipping 122 matching lines @@
   static void Log(const Message* msg, std::wstring* l) {
   }
 
   // Find the end of the message data that starts at range_start.  Returns NULL
   // if the entire message is not found in the given data range.
   static const char* FindNext(const char* range_start, const char* range_end) {
     return Pickle::FindNext(sizeof(Header), range_start, range_end);
   }
 
 #if defined(OS_POSIX)
-  DescriptorSet* descriptor_set() const { return &descriptor_set_; }
+  // On POSIX, a message supports reading / writing FileDescriptor objects.
+  // This is used to pass a file descriptor to the peer of an IPC channel.
+
+  // Add a descriptor to the end of the set. Returns false iff the set is full.
+  bool WriteFileDescriptor(const base::FileDescriptor& descriptor);
+  // Get a file descriptor from the message. Returns false on error.
+  //   iter: a Pickle iterator to the current location in the message.
+  bool ReadFileDescriptor(void** iter, base::FileDescriptor* descriptor) const;
 #endif
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   // Adds the outgoing time from Time::Now() at the end of the message and sets
   // a bit to indicate that it's been added.
   void set_sent_time(int64 time);
   int64 sent_time() const;
 
   void set_received_time(int64 time) const;
   int64 received_time() const { return received_time_; }
@@ skipping 44 matching lines @@
     return headerT<Header>();
   }
   const Header* header() const {
     return headerT<Header>();
   }
 
   void InitLoggingVariables();
 
 #if defined(OS_POSIX)
   // The set of file descriptors associated with this message.
-  mutable DescriptorSet descriptor_set_;
+  scoped_refptr<DescriptorSet> descriptor_set_;
+
+  // Ensure that a DescriptorSet is allocated
+  void EnsureDescriptorSet();
+
+  DescriptorSet* descriptor_set() {
+    EnsureDescriptorSet();
+    return descriptor_set_.get();
+  }
+  const DescriptorSet* descriptor_set() const {
+    return descriptor_set_.get();
+  }
 #endif
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   // Used for logging.
   mutable int64 received_time_;
   mutable std::wstring output_params_;
   mutable LogData* log_data_;
   mutable bool dont_log_;
 #endif
 };
 
 //------------------------------------------------------------------------------
 
 }  // namespace IPC
 
 enum SpecialRoutingIDs {
   // indicates that we don't have a routing ID yet.
   MSG_ROUTING_NONE = -2,
 
   // indicates a general message not sent to a particular tab.
   MSG_ROUTING_CONTROL = kint32max,
 };
 
 #define IPC_REPLY_ID 0xFFF0  // Special message id for replies
 #define IPC_LOGGING_ID 0xFFF1  // Special message id for logging
 
 #endif  // CHROME_COMMON_IPC_MESSAGE_H__