dbus: Remove dbus::FileDescriptor

dbus/message.cc

 // 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.
 
 #include "dbus/message.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 204 matching lines @@
         MessageReader sub_reader(this);
         if (!reader->PopVariant(&sub_reader))
           return kBrokenMessage;
         output += indent + "variant ";
         output += ToStringInternal(indent + "  ", &sub_reader);
         break;
       }
       case UNIX_FD: {
         CHECK(IsDBusTypeUnixFdSupported());
 
-        FileDescriptor file_descriptor;
+        base::ScopedFD file_descriptor;
         if (!reader->PopFileDescriptor(&file_descriptor))
           return kBrokenMessage;
         output += indent + "fd#" +
-                  base::IntToString(file_descriptor.value()) + "\n";
+                  base::IntToString(file_descriptor.get()) + "\n";
         break;
       }
       default:
         LOG(FATAL) << "Unknown type: " << type;
     }
   }
   return output;
 }
 
 // The returned string consists of message headers such as
@@ skipping 472 matching lines @@
   OpenVariant(signature, &variant_writer);
   variant_writer.AppendBasic(dbus_type, value);
   CloseContainer(&variant_writer);
 }
 
 void MessageWriter::AppendFileDescriptor(int value) {
   CHECK(IsDBusTypeUnixFdSupported());
   AppendBasic(DBUS_TYPE_UNIX_FD, &value);  // This duplicates the FD.
 }
 
-void MessageWriter::AppendFileDescriptor(const FileDescriptor& value) {
-  CHECK(IsDBusTypeUnixFdSupported());
-
-  if (!value.is_valid()) {
-    // NB: sending a directory potentially enables sandbox escape
-    LOG(FATAL) << "Attempt to pass invalid file descriptor";
-  }
-  int fd = value.value();
-  AppendBasic(DBUS_TYPE_UNIX_FD, &fd);
-}
-
 //
 // MessageReader implementation.
 //
 
 MessageReader::MessageReader(Message* message)
     : message_(message) {
   memset(&raw_message_iter_, 0, sizeof(raw_message_iter_));
   if (message)
     dbus_message_iter_init(message_->raw_message(), &raw_message_iter_);
 }
@@ skipping 283 matching lines @@
 
   int fd = -1;
   const bool success = PopBasic(DBUS_TYPE_UNIX_FD, &fd);
   if (!success)
     return false;
 
   *value = base::ScopedFD(fd);
   return true;
 }
 
-bool MessageReader::PopFileDescriptor(FileDescriptor* value) {
-  CHECK(IsDBusTypeUnixFdSupported());
-
-  int fd = -1;
-  const bool success = PopBasic(DBUS_TYPE_UNIX_FD, &fd);
-  if (!success)
-    return false;
-
-  value->PutValue(fd);
-  // NB: the caller must check validity before using the value
-  return true;
-}
-
 }  // namespace dbus