IPC: Generalize FileDescriptorSet to MessageAttachmentSet

ipc/mojo/ipc_message_pipe_reader.cc

Index: ipc/mojo/ipc_message_pipe_reader.cc
diff --git a/ipc/mojo/ipc_message_pipe_reader.cc b/ipc/mojo/ipc_message_pipe_reader.cc
index f5ab1b9de06656a7d13c4435d3241fa57fa7fdff..72e7ad7618f4c31b2587bd554f0f6ff381a73a2d 100644
--- a/ipc/mojo/ipc_message_pipe_reader.cc
+++ b/ipc/mojo/ipc_message_pipe_reader.cc
@@ -46,7 +46,7 @@ bool MessagePipeReader::Send(scoped_ptr<Message> message) {
   std::vector<MojoHandle> handles;
   MojoResult result = MOJO_RESULT_OK;
 #if defined(OS_POSIX) && !defined(OS_NACL)
-  result = ChannelMojo::ReadFromFileDescriptorSet(message.get(), &handles);
+  result = ChannelMojo::ReadFromMessageAttachmentSet(message.get(), &handles);
 #endif
   if (result == MOJO_RESULT_OK) {
     result = MojoWriteMessage(handle(),
@@ -74,7 +74,7 @@ void MessagePipeReader::OnMessageReceived() {
   TakeHandleBuffer(&handle_buffer);
 #if defined(OS_POSIX) && !defined(OS_NACL)
   MojoResult write_result =
-      ChannelMojo::WriteToFileDescriptorSet(handle_buffer, &message);
+      ChannelMojo::WriteToMessageAttachmentSet(handle_buffer, &message);
   if (write_result != MOJO_RESULT_OK) {
     CloseWithError(write_result);
     return;