IPC: Get rid of FileDescriptor usage from FileDescriptorSet and Message

This is a step toward to killing FileDescriptor.
This change lets FiileDescriptorSet have both Files (for owning fds)
and PlatformFiles (for non-owning fds). Doing this, we no longer
need FileDescriptor which provides |auto_close| flag.

BUG=415294
TEST=ipc_tests, ipc_mojo_unittests
R=agl@chromium.org, jam@hcromium.org, viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/583473002

Cr-Commit-Position: refs/heads/master@{#296498}

1 files changed, 4 insertions, 7 deletions

diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index 198e6c0..a48fcb1 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
+#include "base/files/file.h"
 #include "base/pickle.h"
 #include "ipc/ipc_export.h"
 
@@ -20,10 +21,6 @@
 #include "base/memory/ref_counted.h"
 #endif
 
-namespace base {
-struct FileDescriptor;
-}
-
 class FileDescriptorSet;
 
 namespace IPC {
@@ -178,12 +175,12 @@ class IPC_EXPORT Message : public Pickle {
   // 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;