IPC: Get rid of FileDescriptor usage from FileDescriptorSet and Message

ipc/mojo/ipc_channel_mojo_unittest.cc

 // Copyright 2014 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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include "base/base_paths.h"
 #include "base/files/file.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 263 matching lines @@
 #if defined(OS_POSIX)
 class ListenerThatExpectsFile : public IPC::Listener {
  public:
   ListenerThatExpectsFile()
       : sender_(NULL) {}
 
   virtual ~ListenerThatExpectsFile() {}
 
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     PickleIterator iter(message);
-    base::FileDescriptor desc;
-    EXPECT_TRUE(message.ReadFileDescriptor(&iter, &desc));
+
+    base::ScopedFD fd;
+    EXPECT_TRUE(message.ReadFile(&iter, &fd));
+    base::File file(fd.release());
     std::string content(GetSendingFileContent().size(), ' ');
-    base::File file(desc.fd);
     file.Read(0, &content[0], content.size());
     EXPECT_EQ(content, GetSendingFileContent());
     base::MessageLoop::current()->Quit();
     ListenerThatExpectsOK::SendOK(sender_);
     return true;
   }
 
   virtual void OnChannelError() OVERRIDE {
     NOTREACHED();
   }
 
   static std::string GetSendingFileContent() {
     return "Hello";
   }
 
   static base::FilePath GetSendingFilePath() {
     base::FilePath path;
     bool ok = PathService::Get(base::DIR_CACHE, &path);
     EXPECT_TRUE(ok);
     return path.Append("ListenerThatExpectsFile.txt");
   }
 
   static void WriteAndSendFile(IPC::Sender* sender, base::File& file) {
     std::string content = GetSendingFileContent();
     file.WriteAtCurrentPos(content.data(), content.size());
     file.Flush();
     IPC::Message* message = new IPC::Message(
         0, 2, IPC::Message::PRIORITY_NORMAL);
-    message->WriteFileDescriptor(
-        base::FileDescriptor(file.TakePlatformFile(), false));
+    message->WriteFile(base::ScopedFD(file.TakePlatformFile()));
     ASSERT_TRUE(sender->Send(message));
   }
 
   void set_sender(IPC::Sender* sender) { sender_ = sender; }
 
  private:
   IPC::Sender* sender_;
 };
 
 
@@ skipping 24 matching lines @@
   client.Connect();
   listener.set_sender(client.channel());
 
   base::MessageLoop::current()->Run();
 
   return 0;
 }
 #endif
 
 }  // namespace