IPC: Get rid of FileDescriptor usage from FileDescriptorSet and Message

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/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 base {
-struct FileDescriptor;
-}
-
 class FileDescriptorSet;
 
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
 struct LogData;
 
 class IPC_EXPORT Message : public Pickle {
  public:
@@ skipping 134 matching lines @@
   // 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 WriteFileDescriptor(const base::FileDescriptor& descriptor);
+  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 ReadFileDescriptor(PickleIterator* iter,
-                          base::FileDescriptor* descriptor) const;
+  bool ReadFile(PickleIterator* iter, base::ScopedFD* file) const;
 
   // Returns true if there are any file descriptors in this message.
   bool HasFileDescriptors() 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;
@@ skipping 90 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_