IPC::Message Refactoring: Move POSIX specific bits to PlatformFileAttachment

ipc/ipc_message.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.
 
 #ifndef IPC_IPC_MESSAGE_H_
 #define IPC_IPC_MESSAGE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
-#include "base/files/file.h"
+#include "base/memory/ref_counted.h"
 #include "base/pickle.h"
 #include "ipc/ipc_export.h"
 
 #if !defined(NDEBUG)
 #define IPC_MESSAGE_LOG_ENABLED
 #endif
 
-#if defined(OS_POSIX)
-#include "base/memory/ref_counted.h"
-#endif
-
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
 struct LogData;
+class MessageAttachment;
 class MessageAttachmentSet;
 
 class IPC_EXPORT Message : public Pickle {
  public:
   enum PriorityValue {
     PRIORITY_LOW = 1,
     PRIORITY_NORMAL,
     PRIORITY_HIGH
   };
 
@@ skipping 123 matching lines @@
   // Used for async messages with no parameters.
   static void Log(std::string* name, const Message* msg, std::string* 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)
-  // 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 if the set is full.
-  bool WriteFile(base::ScopedFD descriptor);
-  bool WriteBorrowingFile(const base::PlatformFile& descriptor);
-
-  // Get a file descriptor from the message. Returns false on error.
-  //   iter: a Pickle iterator to the current location in the message.
-  bool ReadFile(PickleIterator* iter, base::ScopedFD* file) const;
-
-  // Returns true if there are any file descriptors in this message.
-  bool HasFileDescriptors() const;
-#endif
+  bool WriteAttachment(scoped_refptr<MessageAttachment> attachment);

[agl, 2015/01/30 19:34:02]

comments for these?

// WriteAttachment appends |attachment| to the end of the set. It returns false
iff the set is full.

[Hajime Morrita, 2015/01/30 21:01:29]

Thank you for the suggestion! Adopted.

+  bool ReadAttachment(PickleIterator* iter,

[agl, 2015/01/30 19:34:02]

// ReadAttachment parses an attachment given the parsing state |iter| and writes
it to |*attachment|. It returns true on success.

[Hajime Morrita, 2015/01/30 21:01:29]

Done.

+                      scoped_refptr<MessageAttachment>* attachment) const;
+  // Returns true if there are any attachment in this message.
+  bool HasAttachments() const;
 
 #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_; }
   void set_output_params(const std::string& op) const { output_params_ = op; }
@@ skipping 84 matching lines @@
   MSG_ROUTING_NONE = -2,
 
   // indicates a general message not sent to a particular tab.
   MSG_ROUTING_CONTROL = kint32max,
 };
 
 #define IPC_REPLY_ID 0xFFFFFFF0  // Special message id for replies
 #define IPC_LOGGING_ID 0xFFFFFFF1  // Special message id for logging
 
 #endif  // IPC_IPC_MESSAGE_H_