| Index: dbus/message.h
|
| diff --git a/dbus/message.h b/dbus/message.h
|
| index 272a740e4430b9d4701644b7643f6c8b7063c3ed..256a8428c587b36f4fdb7c7ff287a4b07425b41b 100644
|
| --- a/dbus/message.h
|
| +++ b/dbus/message.h
|
| @@ -16,7 +16,6 @@
|
| #include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| #include "dbus/dbus_export.h"
|
| -#include "dbus/file_descriptor.h"
|
| #include "dbus/object_path.h"
|
|
|
| namespace google {
|
| @@ -291,10 +290,6 @@ class CHROME_DBUS_EXPORT MessageWriter {
|
| // The FD will be duplicated so you still have to close the original FD.
|
| void AppendFileDescriptor(int value);
|
|
|
| - // DEPRECATED: Use the method with the same name above instead.
|
| - // TODO(hashimoto): Remove this. crbug.com/621841
|
| - void AppendFileDescriptor(const FileDescriptor& value);
|
| -
|
| // Opens an array. The array contents can be added to the array with
|
| // |sub_writer|. The client code must close the array with
|
| // CloseContainer(), once all contents are added.
|
| @@ -408,10 +403,6 @@ class CHROME_DBUS_EXPORT MessageReader {
|
| bool PopObjectPath(ObjectPath* value);
|
| bool PopFileDescriptor(base::ScopedFD* value);
|
|
|
| - // DEPRECATED: Use the method with the same name above.
|
| - // TODO(hashimoto): Remove this. crbug.com/621841
|
| - bool PopFileDescriptor(FileDescriptor* value);
|
| -
|
| // Sets up the given message reader to read an array at the current
|
| // iterator position.
|
| // Returns true and advances the iterator on success.
|
|
|